From adf5af1bc500ef0261e82b7286f16c46f9760dc7 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Sun, 22 Mar 2020 15:14:46 -0400
Subject: [PATCH] ci: update cache tarball URLs

---
 ci/azure/linux_script    |  2 +-
 ci/azure/macos_script    | 28 ++++++++++++++--------------
 ci/azure/windows_install |  4 ++--
 ci/srht/freebsd_script   |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ci/azure/linux_script b/ci/azure/linux_script
index a93135a02ed88635e52fc011041c1c9986340577..144d1de735f82efbb6b770cc6642a638e498bb35 100755
--- a/ci/azure/linux_script
+++ b/ci/azure/linux_script
@@ -30,7 +30,7 @@ VERSION="$(./zig version)"
 if [ "${BUILD_REASON}" != "PullRequest" ]; then
   ARTIFACTSDIR="$BUILDDIR/artifacts"
   mkdir "$ARTIFACTSDIR"
-  docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64 -j2 $BUILD_SOURCEVERSION
+  docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64-1 -j2 $BUILD_SOURCEVERSION
   TARBALL="$(ls $ARTIFACTSDIR)"
   mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
   s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/
diff --git a/ci/azure/macos_script b/ci/azure/macos_script
index 79eaa0703b75f43d97ef67be8d33c13bd1159554..20d4ad71bf0a20af927257335708b8b2cd5335fd 100755
--- a/ci/azure/macos_script
+++ b/ci/azure/macos_script
@@ -5,20 +5,20 @@ set -e
 
 system_profiler SPHardwareDataType
 
-brew install s3cmd gcc@8
+brew install s3cmd gcc@9
 
 ZIGDIR="$(pwd)"
 LLVMVER="10.0.0"
 ARCH="x86_64"
-CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macos-gcc8-release"
+CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc8-release"
 PREFIX="$HOME/$CACHE_BASENAME"
 TMPDIR="$HOME/tmpz"
 JOBS="-j2"
 
 # I tried using the system default compiler (clang), but it couldn't statically link libc++.
-# So we use gcc-8 from homebrew.
-export CC=gcc-8
-export CXX=g++-8
+# So we use gcc-9 from homebrew.
+export CC=gcc-9
+export CXX=g++-9
 
 rm -rf $PREFIX
 rm -rf $TMPDIR
@@ -54,15 +54,6 @@ else
   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/$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
-  make $JOBS install
-
   cd $TMPDIR
   wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVMVER/lld-$LLVMVER.src.tar.xz
   tar xf lld-$LLVMVER.src.tar.xz
@@ -72,6 +63,15 @@ else
   cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release
   make $JOBS install
 
+  cd $TMPDIR
+  wget https://releases.llvm.org/$LLVMVER/clang-$LLVMVER.src.tar.xz
+  tar xf clang-$LLVMVER.src.tar.xz
+  cd clang-$LLVMVER.src/
+  mkdir build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release
+  make $JOBS install
+
   cd $HOME
   tar cfJ "$CACHE_BASENAME.tar.xz" "$CACHE_BASENAME"
   cp "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
diff --git a/ci/azure/windows_install b/ci/azure/windows_install
index 6fc1d86c8d522ca05d5000a5c953fc6bef31bc7f..ece3bbde114da94f1abe8ee5d1f90e30658a182f 100755
--- a/ci/azure/windows_install
+++ b/ci/azure/windows_install
@@ -6,5 +6,5 @@ set -e
 pacman -Su --needed --noconfirm
 pacman -S --needed --noconfirm wget p7zip python3-pip
 pip install s3cmd
-wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-mt.tar.xz"
-tar xf llvm+clang-10.0.0-win64-msvc-release.tar.xz
+wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
+tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz
diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script
index 247e0f4a5794e2960b20a23a3aec2c2b0aa0e4d7..97b869c9f90ea1f68060359a521bcedff514bad8 100755
--- a/ci/srht/freebsd_script
+++ b/ci/srht/freebsd_script
@@ -7,12 +7,12 @@ sudo pkg update -fq
 sudo pkg install -y cmake py27-s3cmd wget curl jq
 
 ZIGDIR="$(pwd)"
-CACHE_BASENAME="llvm+clang-10.0.0-freebsd-x86_64-release"
+CACHE_BASENAME="llvm+clang+lld-10.0.0-x86_64-freebsd-release"
 PREFIX="$HOME/$CACHE_BASENAME"
 JOBS="-j$(sysctl -n hw.ncpu)"
 
 cd $HOME
-wget -nv "https://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
+wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
 tar xf "$CACHE_BASENAME.tar.xz"
 
 cd $ZIGDIR
-- 
2.54.0