11variables :
22 # Version of clang host compiler.
3- CLANG_VERSION : 9 .0.0
3+ CLANG_VERSION : 10 .0.0
44 LLVM_PROJECTS_TO_ENABLE : compiler-rt;lld;mlir
55 LLVM_TARGETS_TO_BUILD : AArch64;ARM;Mips;MSP430;NVPTX;PowerPC;RISCV;WebAssembly;X86
66 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD : AVR
@@ -72,24 +72,23 @@ jobs:
7272 set -ex
7373 cd ..
7474 export DEBIAN_FRONTEND=noninteractive
75+ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
76+ CLANG_MAJOR=${CLANG_VERSION%%\.*}
77+ sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-$CLANG_MAJOR main"
7578 sudo apt-get -q update
7679 sudo apt-get -yq install \
77- git-core cmake ninja-build binutils-dev python p7zip-full
78- # Download & extract clang
79- curl -L -o clang.tar.xz http://releases.llvm.org/$CLANG_VERSION/clang+llvm-$CLANG_VERSION-x86_64-linux-gnu-ubuntu-16.04.tar.xz
80- mkdir clang
81- tar -xf clang.tar.xz --strip 1 -C clang
80+ git-core cmake ninja-build clang-$CLANG_MAJOR binutils-dev python p7zip-full
8281 # Set CC and CXX to clang[++] for future steps
8382 set +x
84- echo "##vso[task.setvariable variable=CC]$PWD/clang /bin/clang"
85- echo "##vso[task.setvariable variable=CXX]$PWD/clang /bin/clang++"
83+ echo "##vso[task.setvariable variable=CC]/usr /bin/clang-$CLANG_MAJOR "
84+ echo "##vso[task.setvariable variable=CXX]/usr /bin/clang++-$CLANG_MAJOR "
8685 displayName: Install prerequisites
8786 - template : .azure-pipelines/posix.yml
8887
8988- job : macOS
9089 timeoutInMinutes : 180
9190 pool :
92- vmImage : ' macOS-10.14 '
91+ vmImage : ' macOS-10.15 '
9392 variables :
9493 CI_OS : osx
9594 ARCH : x86_64
@@ -109,7 +108,7 @@ jobs:
109108 set -ex
110109 cd ..
111110 # Download & extract Ninja
112- curl -L -o ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.9 .0/ninja-mac.zip
111+ curl -L -o ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10 .0/ninja-mac.zip
113112 mkdir ninja
114113 tar -xf ninja-mac.zip -C ninja
115114 displayName: Install prerequisites
@@ -125,6 +124,7 @@ jobs:
125124 LLVM_TARGETS_TO_BUILD : AArch64;ARM;WebAssembly;X86
126125 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD : ' '
127126 LLVM_ENABLE_ASSERTIONS : OFF
127+ ANDROID_NDK_VERSION : r21d
128128 strategy :
129129 matrix :
130130 armv7a :
@@ -164,12 +164,12 @@ jobs:
164164 set -ex
165165 cd ..
166166 # Download & extract Android NDK
167- curl -OL https://dl.google.com/android/repository/android-ndk-r21 -linux-x86_64.zip
168- unzip android-ndk-r21 -linux-x86_64.zip > /dev/null
169- rm android-ndk-r21 -linux-x86_64.zip
167+ curl -OL https://dl.google.com/android/repository/android-ndk-$ANDROID_NDK_VERSION -linux-x86_64.zip
168+ unzip android-ndk-$ANDROID_NDK_VERSION -linux-x86_64.zip > /dev/null
169+ rm android-ndk-$ANDROID_NDK_VERSION -linux-x86_64.zip
170170 # The NDK toolchain file enforces `-g` as base C[XX] flag - remove it to
171171 # *significantly* reduce executable sizes
172- TOOLCHAIN_FILE=$PWD/android-ndk-r21 /build/cmake/android.toolchain.cmake
172+ TOOLCHAIN_FILE=$PWD/android-ndk-$ANDROID_NDK_VERSION /build/cmake/android.toolchain.cmake
173173 sed -i 's|^ -g$||' $TOOLCHAIN_FILE
174174 # Set EXTRA_CMAKE_FLAGS_ANDROID for future steps
175175 set +x
0 commit comments