Skip to content

Commit ff71660

Browse files
committed
test ci fix
1 parent c089754 commit ff71660

File tree

1 file changed

+34
-27
lines changed

1 file changed

+34
-27
lines changed

.github/workflows/minimal.yml

+34-27
Original file line numberDiff line numberDiff line change
@@ -43,38 +43,38 @@ jobs:
4343
- b2_toolset: clang-3.9
4444
b2_cxxstd: 14
4545
version: "3.9"
46-
os: ubuntu-20.04
46+
os: ubuntu-22.04
4747
- b2_toolset: clang-4.0
4848
b2_cxxstd: 14
4949
version: "4.0"
50-
os: ubuntu-20.04
50+
os: ubuntu-22.04
5151
- b2_toolset: clang-5.0
5252
b2_cxxstd: 14
5353
version: "5.0"
54-
os: ubuntu-20.04
54+
os: ubuntu-22.04
5555
- b2_toolset: clang-6.0
5656
b2_cxxstd: 14
5757
version: "6.0"
58-
os: ubuntu-20.04
58+
os: ubuntu-22.04
5959
- b2_toolset: clang-7
6060
b2_cxxstd: 14,17
6161
version: "7"
62-
os: ubuntu-20.04
62+
os: ubuntu-22.04
6363
- b2_toolset: clang-8
6464
b2_cxxstd: 14,17
6565
version: "8"
66-
os: ubuntu-20.04
66+
os: ubuntu-22.04
6767
- b2_toolset: clang-9
6868
# At some point compilation started to fail with 2a from unknown reason
6969
# It may have something to do with the std library
7070
#b2_cxxstd: 14,17,2a
7171
b2_cxxstd: 14,17
7272
version: "9"
73-
os: ubuntu-20.04
73+
os: ubuntu-22.04
7474
- b2_toolset: clang-10
7575
b2_cxxstd: 14,17,2a
7676
version: "10"
77-
os: ubuntu-20.04
77+
os: ubuntu-22.04
7878
- b2_toolset: clang-11
7979
b2_cxxstd: 14,17,2a
8080
version: "11"
@@ -126,17 +126,21 @@ jobs:
126126
127127
- name: Install
128128
run: |
129-
# Required for compilers not available in ubuntu 20.04
130-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
131-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
132-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main"
133-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe"
134-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main"
135-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ bionic universe"
129+
# Required for compilers not available in ubuntu 22.04
130+
sudo mkdir -m 0755 -p /etc/apt/keyrings/
131+
curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x40976EAF437D05B5" | gpg --dearmor | sudo tee /etc/apt/keyrings/xenial.gpg > /dev/null
132+
curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3B4FE6ACC0B21F32" | gpg --dearmor | sudo tee /etc/apt/keyrings/bionic.gpg > /dev/null
133+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/xenial.list
134+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ xenial universe" | sudo tee -a /etc/apt/sources.list.d/xenial.list
135+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list.d/bionic.list
136+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list.d/bionic.list
137+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ focal main" | sudo tee -a /etc/apt/sources.list.d/focal.list
138+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ focal universe" | sudo tee -a /etc/apt/sources.list.d/focal.list
136139
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
137140
sudo apt -q -y update
138141
sudo apt -q -y install clang-${{ matrix.version }} g++-multilib
139142
143+
140144
- name: Bootstrap boostorg/boost
141145
run: |
142146
gcc --version
@@ -184,23 +188,23 @@ jobs:
184188
- b2_toolset: gcc-5
185189
b2_cxxstd: 14
186190
version: "5"
187-
os: ubuntu-20.04
191+
os: ubuntu-22.04
188192
- b2_toolset: gcc-6
189193
b2_cxxstd: 14
190194
version: "6"
191-
os: ubuntu-20.04
195+
os: ubuntu-22.04
192196
- b2_toolset: gcc-7
193197
b2_cxxstd: 14,17
194198
version: "7"
195-
os: ubuntu-20.04
199+
os: ubuntu-22.04
196200
- b2_toolset: gcc-8
197201
b2_cxxstd: 14,17
198202
version: "8"
199-
os: ubuntu-20.04
203+
os: ubuntu-22.04
200204
- b2_toolset: gcc-9
201205
b2_cxxstd: 14,17,2a
202206
version: "9"
203-
os: ubuntu-20.04
207+
os: ubuntu-22.04
204208
- b2_toolset: gcc-10
205209
b2_cxxstd: 14,17,2a
206210
version: "10"
@@ -245,13 +249,16 @@ jobs:
245249
246250
- name: Install
247251
run: |
248-
# Required for compilers not available in ubuntu 20.04
249-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
250-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
251-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main"
252-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe"
253-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main"
254-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ bionic universe"
252+
# Required for compilers not available in ubuntu 22.04
253+
sudo mkdir -m 0755 -p /etc/apt/keyrings/
254+
curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x40976EAF437D05B5" | gpg --dearmor | sudo tee /etc/apt/keyrings/xenial.gpg > /dev/null
255+
curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3B4FE6ACC0B21F32" | gpg --dearmor | sudo tee /etc/apt/keyrings/bionic.gpg > /dev/null
256+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/xenial.list
257+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ xenial universe" | sudo tee -a /etc/apt/sources.list.d/xenial.list
258+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list.d/bionic.list
259+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list.d/bionic.list
260+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ focal main" | sudo tee -a /etc/apt/sources.list.d/focal.list
261+
echo "deb [signed-by=/etc/apt/keyrings/xenial.gpg arch=amd64] http://dk.archive.ubuntu.com/ubuntu/ focal universe" | sudo tee -a /etc/apt/sources.list.d/focal.list
255262
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
256263
sudo apt -q -y update
257264
sudo apt -q -y install g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib

0 commit comments

Comments
 (0)