diff --git a/ci/azure/linux_script b/ci/azure/linux_script index 1116099cd7..a93135a02e 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -5,14 +5,14 @@ set -e BUILDDIR="$(pwd)" -sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list' +sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" >> /etc/apt/sources.list' wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt-get update -q sudo apt-get remove -y llvm-* sudo rm -rf /usr/local/* -sudo apt-get install -y libxml2-dev libclang-9-dev llvm-9 llvm-9-dev cmake s3cmd gcc-7 g++-7 qemu +sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev cmake s3cmd gcc-7 g++-7 qemu # Make the `zig version` number consistent. # This will affect the cmake command below. @@ -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:llvm9-x86_64 -j2 $BUILD_SOURCEVERSION + docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64 -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/drone/drone.yml b/ci/drone/drone.yml index 8fff358a93..b7bc300f4f 100644 --- a/ci/drone/drone.yml +++ b/ci/drone/drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build-and-test - image: ziglang/static-base:llvm9-1 + image: ziglang/static-base:llvm10-aarch64-1 environment: SRHT_OAUTH_TOKEN: from_secret: SRHT_OAUTH_TOKEN