Skip to content

Commit bed9f3f

Browse files
authored
[ci] Upgrade Azure VMSS to use Mariner Linux (#6222)
* Update .vsts-ci.yml for Azure Pipelines Upgrade Azure VM Scale Set to use Mariner (Azure Linux) systems. * Update .vsts-ci.yml * Update .vsts-ci.yml * Update .vsts-ci.yml * Update .vsts-ci.yml * Update .vsts-ci.yml * upgrade clang to clang-17 * add -y in apt install * update name of mariner agent pool * fix clang 17 compiler name * apt update before install clang 17 * update libomp version for clang 17 * use clang-17 only for Mariner agents * fix CXX and CC
1 parent 074b3e8 commit bed9f3f

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.ci/setup.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ else # Linux
5454
sudo apt-get install --no-install-recommends -y \
5555
clang \
5656
libomp-dev
57+
elif [[ $COMPILER == "clang-17" ]]; then
58+
sudo apt-get install wget
59+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
60+
sudo apt-add-repository deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
61+
sudo apt-add-repository deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
62+
sudo apt-get update
63+
sudo apt-get install -y clang-17
64+
sudo apt-get install --no-install-recommends -y libomp-17-dev
5765
fi
5866

5967
export LANG="en_US.UTF-8"

.ci/test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "gcc" ]]; then
66
elif [[ $OS_NAME == "linux" ]] && [[ $COMPILER == "clang" ]]; then
77
export CXX=clang++
88
export CC=clang
9+
elif [[ $OS_NAME == "linux" ]] && [[ $COMPILER == "clang-17" ]]; then
10+
export CXX=clang++-17
11+
export CC=clang-17
912
fi
1013

1114
if [[ $IN_UBUNTU_BASE_CONTAINER == "true" ]]; then

.vsts-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
SETUP_CONDA: 'false'
3535
OS_NAME: 'linux'
3636
PRODUCES_ARTIFACTS: 'true'
37-
pool: sh-ubuntu
37+
pool: sh-mariner
3838
container: linux-artifact-builder
3939
strategy:
4040
matrix:
@@ -82,12 +82,12 @@ jobs:
8282
- job: Linux_latest
8383
###########################################
8484
variables:
85-
COMPILER: clang
85+
COMPILER: clang-17
8686
DEBIAN_FRONTEND: 'noninteractive'
8787
IN_UBUNTU_BASE_CONTAINER: 'true'
8888
OS_NAME: 'linux'
8989
SETUP_CONDA: 'true'
90-
pool: sh-ubuntu
90+
pool: sh-mariner
9191
container: ubuntu-latest
9292
strategy:
9393
matrix:

0 commit comments

Comments
 (0)