From b018f2bae189cbcf2476b4147b108b815af149bc Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 29 Apr 2024 15:09:55 -0700 Subject: [PATCH] CI: download tarball if not already present on macos runners --- ci/aarch64-macos-debug.sh | 6 ++++++ ci/aarch64-macos-release.sh | 6 ++++++ ci/x86_64-macos-release.sh | 13 ++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ci/aarch64-macos-debug.sh b/ci/aarch64-macos-debug.sh index 3a8c1938d34abe4bc0a232312fb29aa32eb952c6..0de04c5b8d1dae035b0b9ee9415d81843fa8d783 100755 --- a/ci/aarch64-macos-debug.sh +++ b/ci/aarch64-macos-debug.sh @@ -13,6 +13,12 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.13.0-dev.69+c8b808826" PREFIX="$HOME/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +if [ ! -d "$PREFIX" ]; then + cd $HOME + curl -L -O "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz" + tar xf "$CACHE_BASENAME.tar.xz" +fi + cd $ZIGDIR # Make the `zig version` number consistent. diff --git a/ci/aarch64-macos-release.sh b/ci/aarch64-macos-release.sh index 3d35b49bd7150478c28be6fc24ab897107c7e5ce..3d7b4ec541e68dfd02add4c700e05c4082f68094 100755 --- a/ci/aarch64-macos-release.sh +++ b/ci/aarch64-macos-release.sh @@ -13,6 +13,12 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.13.0-dev.69+c8b808826" PREFIX="$HOME/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" +if [ ! -d "$PREFIX" ]; then + cd $HOME + curl -L -O "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz" + tar xf "$CACHE_BASENAME.tar.xz" +fi + cd $ZIGDIR # Make the `zig version` number consistent. diff --git a/ci/x86_64-macos-release.sh b/ci/x86_64-macos-release.sh index 3dfbfd3cc01afb3f3f2852176c0cc4c110e69ae1..6e75a1056de4b89c68350d48fca6573cd22dc4dc 100755 --- a/ci/x86_64-macos-release.sh +++ b/ci/x86_64-macos-release.sh @@ -9,15 +9,14 @@ MCPU="baseline" CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.13.0-dev.69+c8b808826" PREFIX="$HOME/$CACHE_BASENAME" JOBS="-j3" - -rm -rf $PREFIX -cd $HOME - -curl -L -O "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz" -tar xf "$CACHE_BASENAME.tar.xz" - ZIG="$PREFIX/bin/zig" +if [ ! -d "$PREFIX" ]; then + cd $HOME + curl -L -O "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz" + tar xf "$CACHE_BASENAME.tar.xz" +fi + cd $ZIGDIR # Make the `zig version` number consistent. -- 2.54.0