diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-12-10 01:32:45 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-12-10 01:32:45 -0500 |
| commit | 2a7103ca345f2bd32f496fe5ac29af68bc813341 (patch) | |
| tree | 9a90e1b5165cc0f4f905cb9d636685cec72eb33c /ci | |
| parent | e6c01e49d8a5104a5b71f4524ac7689ed9be9002 (diff) | |
| download | zig-2a7103ca345f2bd32f496fe5ac29af68bc813341.tar.gz zig-2a7103ca345f2bd32f496fe5ac29af68bc813341.zip | |
ci: update macos to fresh llvm+clang tarball cache
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/azure/macos_script | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 64fee34de4..be21d72f13 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -8,7 +8,9 @@ system_profiler SPHardwareDataType brew install s3cmd gcc@8 ZIGDIR="$(pwd)" -CACHE_BASENAME="llvm+clang-9.0.0-macos-x86_64-gcc8-release" +LLVMVER="9.0.1" +ARCH="x86_64" +CACHE_BASENAME="llvm+clang-$LLVMVER-macos-$ARCH-gcc8-release" PREFIX="$HOME/$CACHE_BASENAME" TMPDIR="$HOME/tmpz" JOBS="-j2" @@ -44,18 +46,18 @@ else rm $PREFIX/lib/libz*dylib cd $TMPDIR - wget https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz - tar xf llvm-9.0.0.src.tar.xz - cd llvm-9.0.0.src/ + wget https://releases.llvm.org/$LLVMVER/llvm-$LLVMVER.src.tar.xz + tar xf llvm-$LLVMVER.src.tar.xz + cd llvm-$LLVMVER.src/ mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_TERMINFO=OFF make $JOBS install cd $TMPDIR - wget https://releases.llvm.org/9.0.0/cfe-9.0.0.src.tar.xz - tar xf cfe-9.0.0.src.tar.xz - cd cfe-9.0.0.src/ + wget https://releases.llvm.org/$LLVMVER/cfe-$LLVMVER.src.tar.xz + tar xf cfe-$LLVMVER.src.tar.xz + cd cfe-$LLVMVER.src/ mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release @@ -86,7 +88,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then rmdir release/bin VERSION=$(release/zig version) - DIRNAME="zig-macos-x86_64-$VERSION" + DIRNAME="zig-macos-$ARCH-$VERSION" TARBALL="$DIRNAME.tar.xz" mv release "$DIRNAME" tar cfJ "$TARBALL" "$DIRNAME" @@ -104,7 +106,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then echo "\"size\": \"$BYTESIZE\"}" >>$JSONFILE s3cmd put -P --add-header="Cache-Control: max-age=0, must-revalidate" "$JSONFILE" "s3://ziglang.org/builds/$JSONFILE" - s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/x86_64-macos-$VERSION.json" + s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$ARCH-macos-$VERSION.json" # `set -x` causes these variables to be mangled. # See https://developercommunity.visualstudio.com/content/problem/375679/pipeline-variable-incorrectly-inserts-single-quote.html |