Skip to content

Commit b655137

Browse files
committed
trying to update azure
1 parent 1f80c8e commit b655137

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

azure-pipelines.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- job: build_ubuntu
1111
displayName: Ubuntu
1212
pool:
13-
vmImage: 'Ubuntu-20.04'
13+
vmImage: 'ubuntu-latest'
1414

1515
strategy:
1616
matrix:
@@ -44,19 +44,16 @@ jobs:
4444
submodules: true
4545
- script: |
4646
#sudo add-apt-repository ppa:ubuntu-toolchain-r/test
47-
#sudo apt-get update
48-
sudo apt-get install -y g++-10
49-
condition: eq(variables['BUILD_TYPE'], 'ASanOpt')
47+
sudo apt-get update
48+
sudo apt-get install -y gcc-11 g++-11 libgcc-11-dev build-essential
5049
- script: |
5150
sudo apt-get update
5251
sudo apt-get -y install mpi-default-dev mpi-default-bin
5352
displayName: Install Dependencies
5453
condition: eq(variables['MPI'], 1)
5554
- script: |
5655
mkdir build && cd build
57-
if [ "${BUILD_TYPE}" = "ASanOpt" ]; then
58-
export CC=gcc-10 ; export CXX=g++-10
59-
fi
56+
export CC=gcc-11 ; export CXX=g++-11
6057
if [ "${STATIC}" -eq "1" ]; then
6158
cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF \
6259
-DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc \
@@ -83,7 +80,7 @@ jobs:
8380
- job: build_ubuntu_cross
8481
displayName: Ubuntu Cross-Compile
8582
pool:
86-
vmImage: 'Ubuntu-20.04'
83+
vmImage: 'ubuntu-latest'
8784
strategy:
8885
matrix:
8986
power8:
@@ -100,16 +97,17 @@ jobs:
10097
CPREF: aarch64
10198
steps:
10299
- script: |
103-
sudo dpkg --add-architecture $ARCH
100+
CODENAME=$(lsb_release -cs)
101+
sudo dpkg --add-architecture "$ARCH"
104102
cat << HEREDOC | sudo tee /etc/apt/sources.list
105-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal main universe multiverse
106-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-updates main universe multiverse
107-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-backports main universe multiverse
108-
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ focal-security main universe multiverse
109-
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse
110-
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main universe multiverse
111-
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main universe multiverse
112-
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ focal-security main universe multiverse
103+
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ ${CODENAME} main universe multiverse
104+
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ ${CODENAME}-updates main universe multiverse
105+
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ ${CODENAME}-backports main universe multiverse
106+
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ ${CODENAME}-security main universe multiverse
107+
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ ${CODENAME} main universe multiverse
108+
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ ${CODENAME}-updates main universe multiverse
109+
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ ${CODENAME}-backports main universe multiverse
110+
deb [arch=$ARCH] http://ports.ubuntu.com/ubuntu-ports/ ${CODENAME}-security main universe multiverse
113111
HEREDOC
114112
sudo apt-get update
115113
sudo apt-get -y install -o APT::Immediate-Configure=false crossbuild-essential-$ARCH zlib1g-dev:$ARCH libbz2-dev:$ARCH
@@ -132,7 +130,7 @@ jobs:
132130
- job: build_macos
133131
displayName: macOS
134132
pool:
135-
vmImage: 'macos-12'
133+
vmImage: 'macos-latest'
136134
steps:
137135
- checkout: self
138136
submodules: true

0 commit comments

Comments
 (0)