Skip to content

Commit d473864

Browse files
committed
fix ci tests
1 parent f78efdf commit d473864

File tree

4 files changed

+19
-300
lines changed

4 files changed

+19
-300
lines changed

.github/workflows/cmake.yml

-104
This file was deleted.

.github/workflows/documentation.yml

-100
This file was deleted.

.github/workflows/headers.yml

-71
This file was deleted.

.github/workflows/minimal.yml

+19-25
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,14 +126,11 @@ jobs:
126126
127127
- name: Install
128128
run: |
129-
# Required for compilers not available in ubuntu 20.04
129+
# Required for compilers not available in ubuntu 22.04
130130
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
131131
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"
136-
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
132+
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ focal main"
133+
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ focal universe"
137134
sudo apt -q -y update
138135
sudo apt -q -y install clang-${{ matrix.version }} g++-multilib
139136
@@ -184,23 +181,23 @@ jobs:
184181
- b2_toolset: gcc-5
185182
b2_cxxstd: 14
186183
version: "5"
187-
os: ubuntu-20.04
184+
os: ubuntu-22.04
188185
- b2_toolset: gcc-6
189186
b2_cxxstd: 14
190187
version: "6"
191-
os: ubuntu-20.04
188+
os: ubuntu-22.04
192189
- b2_toolset: gcc-7
193190
b2_cxxstd: 14,17
194191
version: "7"
195-
os: ubuntu-20.04
192+
os: ubuntu-22.04
196193
- b2_toolset: gcc-8
197194
b2_cxxstd: 14,17
198195
version: "8"
199-
os: ubuntu-20.04
196+
os: ubuntu-22.04
200197
- b2_toolset: gcc-9
201198
b2_cxxstd: 14,17,2a
202199
version: "9"
203-
os: ubuntu-20.04
200+
os: ubuntu-22.04
204201
- b2_toolset: gcc-10
205202
b2_cxxstd: 14,17,2a
206203
version: "10"
@@ -245,14 +242,11 @@ jobs:
245242
246243
- name: Install
247244
run: |
248-
# Required for compilers not available in ubuntu 20.04
245+
# Required for compilers not available in ubuntu 22.04
249246
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
250247
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"
255-
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
248+
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ focal main"
249+
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ focal universe"
256250
sudo apt -q -y update
257251
sudo apt -q -y install g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib
258252

0 commit comments

Comments
 (0)