From 0ebf0e0ecea6153d2728b9952bbdc8000e4f067a Mon Sep 17 00:00:00 2001 From: richardg867 Date: Fri, 15 Jul 2022 23:12:27 -0300 Subject: [PATCH 1/2] Jenkins: Fix small typo in tarball script --- .ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build.sh b/.ci/build.sh index da4169516..98dbf3e3f 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -65,7 +65,7 @@ make_tar() { # Prefer gnutar on macOS. local tar_cmd=tar - which gnutar > /dev/null 2>&1 && tar_cmd=gnutar + which gnutar > /dev/null 2>&1 && local tar_cmd=gnutar # Determine the best supported compression type. local compression_flag= From 00b63fe9b8777d9875c585980fbc5fef60a0476e Mon Sep 17 00:00:00 2001 From: richardg867 Date: Fri, 15 Jul 2022 23:17:07 -0300 Subject: [PATCH 2/2] Jenkins: More macOS stuff --- .ci/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index 98dbf3e3f..278e252d8 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -59,11 +59,12 @@ make_tar() { sudo apt-get clean elif which port > /dev/null 2>&1 then + sudo port selfupdate sudo port install gnutar xz fi fi - - # Prefer gnutar on macOS. + + # Use MacPorts gnutar (if installed) on macOS. local tar_cmd=tar which gnutar > /dev/null 2>&1 && local tar_cmd=gnutar