Skip to content

Commit 7709b64

Browse files
committed
Add gcc 15 to CI
1 parent 741b319 commit 7709b64

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

.github/workflows/cmake.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
1515
name: ${{ matrix.config.name }}
1616
runs-on: ${{ matrix.config.os }}
17+
# Allow specifying a container per-matrix to avoid duplicating jobs
18+
container: ${{ matrix.config.container }}
1719

1820
strategy:
1921
fail-fast: false
@@ -104,15 +106,17 @@ jobs:
104106
cxxver: 20,
105107
}
106108
- {
107-
name: "Linux g++ 15 C++17",
109+
name: "Linux g++ 15 (Debian) C++17",
108110
os: ubuntu-24.04,
111+
container: debian:testing,
109112
buildtype: Release,
110113
cxx: "g++-15",
111114
cxxver: 17,
112115
}
113116
- {
114-
name: "Linux g++ 15 C++20",
117+
name: "Linux g++ 15 (Debian) C++20",
115118
os: ubuntu-24.04,
119+
container: debian:testing,
116120
buildtype: Release,
117121
cxx: "g++-15",
118122
cxxver: 20,
@@ -488,13 +492,21 @@ jobs:
488492
489493
- name: Install g++ 15
490494
id: install_gcc_15
491-
if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-15' )
495+
if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-15' ) && ( !matrix.config.container )
492496
shell: bash
493497
working-directory: ${{ env.HOME }}
494498
run: |
495499
sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
496500
sudo apt-get install g++-15
497501
502+
- name: Install GCC 15 and tools (Debian container)
503+
if: matrix.config.container == 'debian:testing' && matrix.config.cxx == 'g++-15'
504+
shell: bash
505+
run: |
506+
apt-get update
507+
DEBIAN_FRONTEND=noninteractive apt-get install -y \
508+
g++-15 cmake ninja-build build-essential pkg-config
509+
498510
- name: Install MSVC 2017
499511
id: install_msvc_2017
500512
if: startsWith(matrix.config.os, 'windows-2019') && ( matrix.config.cxx == 'cl' ) && ( matrix.config.msvcver == 2017 )
@@ -563,3 +575,4 @@ jobs:
563575
# Execute tests defined by the CMake configuration.
564576
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
565577
run: ctest --output-on-failure -C ${{ matrix.config.buildtype }}
578+

0 commit comments

Comments
 (0)