authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-12 18:38:28-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-12 18:38:28-07:00
log74e3ffa9b4fec971a18d08cc808f3ed9b884db15
tree0a2fa180fc7efe3208f15d707efa46c52df523a9
parentc19dcafa17117475f8334d5186bd87fb56c9d315

ci: update llvm 10 => 11


6 files changed, 15 insertions(+), 15 deletions(-)

ci/azure/linux_script+3-3
......@@ -5,14 +5,14 @@ set -e
55
66BUILDDIR="$(pwd)"
77
8sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" >> /etc/apt/sources.list'
8sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" >> /etc/apt/sources.list'
99wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
1010sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
1111sudo apt-get update -q
1212
1313sudo apt-get remove -y llvm-*
1414sudo rm -rf /usr/local/*
15sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7 ninja-build tidy
15sudo apt-get install -y libxml2-dev libclang-11-dev llvm-11 llvm-11-dev liblld-11-dev cmake s3cmd gcc-7 g++-7 ninja-build tidy
1616
1717QEMUBASE="qemu-linux-x86_64-5.1.0"
1818wget https://ziglang.org/deps/$QEMUBASE.tar.xz
......@@ -44,7 +44,7 @@ VERSION="$(./zig version)"
4444if [ "${BUILD_REASON}" != "PullRequest" ]; then
4545 ARTIFACTSDIR="$BUILDDIR/artifacts"
4646 mkdir "$ARTIFACTSDIR"
47 docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64-1 -j2 $BUILD_SOURCEVERSION
47 docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm11-x86_64-1 -j2 $BUILD_SOURCEVERSION
4848 TARBALL="$(ls $ARTIFACTSDIR)"
4949 mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
5050 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/
ci/azure/macos_script+7-7
......@@ -5,24 +5,24 @@ set -e
55
66system_profiler SPHardwareDataType
77
8brew install s3cmd gcc@9
8brew install s3cmd gcc@10
99
1010ZIGDIR="$(pwd)"
11LLVMVER="10.0.1"
11LLVMVER="11.0.0"
1212ARCH="x86_64"
13CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc9-release"
13CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc10-release"
1414PREFIX="$HOME/$CACHE_BASENAME"
1515JOBS="-j2"
1616
1717# I tried using the system default compiler (clang), but it couldn't statically link libc++.
18# So we use gcc-9 from homebrew.
19export CC=gcc-9
20export CXX=g++-9
18# So we use gcc-10 from homebrew.
19export CC=gcc-10
20export CXX=g++-10
2121
2222rm -rf $PREFIX
2323
2424cd $HOME
25wget -nv "https://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
25wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
2626tar xf "$CACHE_BASENAME.tar.xz"
2727
2828cd $ZIGDIR
ci/azure/windows_msvc_install+2-2
......@@ -7,5 +7,5 @@ pacman -Su --needed --noconfirm
77pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
88
99pip install s3cmd
10wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
11tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz
10wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-11.0.0-x86_64-windows-msvc-release-mt.tar.xz"
11tar xf llvm+clang+lld-11.0.0-x86_64-windows-msvc-release-mt.tar.xz
ci/azure/windows_msvc_script.bat+1-1
......@@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%"
1111
1212SET "ZIGBUILDDIR=%SRCROOT%\build"
1313SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-11.0.0-x86_64-windows-msvc-release-mt"
1515
1616call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
1717
ci/drone/drone.yml+1-1
......@@ -7,7 +7,7 @@ platform:
77
88steps:
99- name: build-and-test
10 image: ziglang/static-base:llvm10-aarch64-1
10 image: ziglang/static-base:llvm11-aarch64-1
1111 environment:
1212 SRHT_OAUTH_TOKEN:
1313 from_secret: SRHT_OAUTH_TOKEN
ci/srht/freebsd_script+1-1
......@@ -7,7 +7,7 @@ sudo pkg update -fq
77sudo pkg install -y cmake py27-s3cmd wget curl jq
88
99ZIGDIR="$(pwd)"
10CACHE_BASENAME="llvm+clang+lld-10.0.0-x86_64-freebsd-release"
10CACHE_BASENAME="llvm+clang+lld-11.0.0-x86_64-freebsd-release"
1111PREFIX="$HOME/$CACHE_BASENAME"
1212JOBS="-j$(sysctl -n hw.ncpu)"
1313