authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-22 17:54:58-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-22 17:54:58-05:00
log211e1b1ced84ac0408e66b13366259fb232f54f7
treea67a26357a2c5a2d75d902fa9065691d1d756b22
parent74872263cc83bb7cbd8d548e83b441f4bf2f2249
signaturelock-open Commit is signed but in an unrecognized format.

ci: update to llvm 10


2 files changed, 4 insertions(+), 4 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-9 main" >> /etc/apt/sources.list'
8sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 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-9-dev llvm-9 llvm-9-dev cmake s3cmd gcc-7 g++-7 qemu
15sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev cmake s3cmd gcc-7 g++-7 qemu
1616
1717# Make the `zig version` number consistent.
1818# This will affect the cmake command below.
......@@ -30,7 +30,7 @@ VERSION="$(./zig version)"
3030if [ "${BUILD_REASON}" != "PullRequest" ]; then
3131 ARTIFACTSDIR="$BUILDDIR/artifacts"
3232 mkdir "$ARTIFACTSDIR"
33 docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm9-x86_64 -j2 $BUILD_SOURCEVERSION
33 docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64 -j2 $BUILD_SOURCEVERSION
3434 TARBALL="$(ls $ARTIFACTSDIR)"
3535 mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
3636 s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/
ci/drone/drone.yml+1-1
......@@ -7,7 +7,7 @@ platform:
77
88steps:
99- name: build-and-test
10 image: ziglang/static-base:llvm9-1
10 image: ziglang/static-base:llvm10-aarch64-1
1111 environment:
1212 SRHT_OAUTH_TOKEN:
1313 from_secret: SRHT_OAUTH_TOKEN