Skip to content

Commit 6a0efe7

Browse files
committed
Updated GitHub Actions CI.
Removed macos-12 job as the image has been removed from GHA. Added new compilers and updated the old ones to avoid using external package repositories. Added CMake testing with MinGW-w64.
1 parent 59433a9 commit 6a0efe7

File tree

1 file changed

+51
-36
lines changed

1 file changed

+51
-36
lines changed

.github/workflows/ci.yml

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,32 @@ jobs:
8282
- g++-10
8383
- toolset: gcc-11
8484
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
85-
os: ubuntu-20.04
85+
os: ubuntu-22.04
8686
install:
8787
- g++-11
88-
sources:
89-
- "ppa:ubuntu-toolchain-r/test"
9088
- toolset: gcc-12
9189
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
9290
os: ubuntu-22.04
9391
install:
9492
- g++-12
9593
- toolset: gcc-13
9694
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
97-
os: ubuntu-latest
98-
container: ubuntu:23.04
95+
os: ubuntu-24.04
9996
install:
10097
- g++-13
98+
- toolset: gcc-14
99+
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu,26-gnu"
100+
os: ubuntu-24.04
101+
install:
102+
- g++-14
101103
- name: UBSAN
102-
toolset: gcc-11
103-
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu"
104+
toolset: gcc-13
105+
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
104106
ubsan: 1
105107
build_variant: debug
106-
os: ubuntu-20.04
108+
os: ubuntu-24.04
107109
install:
108-
- g++-11
109-
sources:
110-
- "ppa:ubuntu-toolchain-r/test"
110+
- g++-13
111111

112112
# Linux, clang
113113
- toolset: clang
@@ -134,7 +134,7 @@ jobs:
134134
- toolset: clang
135135
compiler: clang++-3.8
136136
cxxstd: "11,14"
137-
os: ubuntu-20.04
137+
os: ubuntu-latest
138138
container: ubuntu:16.04
139139
install:
140140
- clang-3.8
@@ -248,54 +248,64 @@ jobs:
248248
- toolset: clang
249249
compiler: clang++-16
250250
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,2b-gnu"
251-
os: ubuntu-22.04
251+
os: ubuntu-24.04
252252
install:
253253
- clang-16
254-
sources:
255-
- "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
256-
source_keys:
257-
- "https://apt.llvm.org/llvm-snapshot.gpg.key"
254+
- g++-11
255+
gcc_toolchain: 11
258256
- toolset: clang
259257
compiler: clang++-17
260258
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
261-
os: ubuntu-22.04
259+
os: ubuntu-24.04
262260
install:
263261
- clang-17
262+
- g++-11
263+
gcc_toolchain: 11
264+
- toolset: clang
265+
compiler: clang++-18
266+
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu,26-gnu"
267+
os: ubuntu-24.04
268+
install:
269+
- clang-18
270+
- g++-13
271+
- toolset: clang
272+
compiler: clang++-19
273+
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu,26-gnu"
274+
os: ubuntu-24.04
275+
install:
276+
- clang-19
264277
sources:
265-
- "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
278+
- "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
266279
source_keys:
267280
- "https://apt.llvm.org/llvm-snapshot.gpg.key"
268281
- toolset: clang
269-
compiler: clang++-17
270-
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
282+
compiler: clang++-19
283+
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu,26-gnu"
271284
cxxflags: -stdlib=libc++
272285
linkflags: -stdlib=libc++
273-
os: ubuntu-22.04
286+
os: ubuntu-24.04
274287
install:
275-
- clang-17
276-
- libc++-17-dev
277-
- libc++abi-17-dev
288+
- clang-19
289+
- libc++-19-dev
290+
- libc++abi-19-dev
278291
sources:
279-
- "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
292+
- "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
280293
source_keys:
281294
- "https://apt.llvm.org/llvm-snapshot.gpg.key"
282295
- name: UBSAN
283296
toolset: clang
284-
compiler: clang++-15
285-
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,2b-gnu"
297+
compiler: clang++-18
298+
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu,26-gnu"
286299
cxxflags: -stdlib=libc++
287300
linkflags: "-stdlib=libc++ -lubsan"
288301
ubsan: 1
289302
build_variant: debug
290-
os: ubuntu-22.04
303+
os: ubuntu-24.04
291304
install:
292-
- clang-15
293-
- libc++-15-dev
294-
- libc++abi-15-dev
305+
- clang-18
306+
- libc++-18-dev
307+
- libc++abi-18-dev
295308

296-
- toolset: clang
297-
cxxstd: "11,14,17,20,2b"
298-
os: macos-12
299309
- toolset: clang
300310
cxxstd: "11,14,17,20,2b"
301311
os: macos-13
@@ -564,9 +574,13 @@ jobs:
564574
cxxstd: "11-gnu,14-gnu,17-gnu,2a-gnu"
565575
os: windows-2019
566576

567-
- name: CMake tests
577+
- name: CMake MSVC tests
578+
cmake_tests: 1
579+
os: windows-2022
580+
- name: CMake MinGW-w64 tests
568581
cmake_tests: 1
569582
os: windows-2022
583+
cmake_generator: "MinGW Makefiles"
570584

571585
timeout-minutes: 30
572586
runs-on: ${{matrix.os}}
@@ -625,6 +639,7 @@ jobs:
625639
- name: Run CMake tests
626640
if: matrix.cmake_tests
627641
run: |
642+
if not "${{matrix.cmake_generator}}" == "" set "CMAKE_GENERATOR=${{matrix.cmake_generator}}"
628643
cd boost-root
629644
mkdir __build_static__
630645
cd __build_static__

0 commit comments

Comments
 (0)