Skip to content

Commit 80e1f09

Browse files
committed
ci: add newer compilers to the matrix
This also: * Makes sure the ubuntu clang builds have libstdc++-14 installed, which is our minumum. * Bumps cpp-actions to v1.8.10
1 parent 521cc70 commit 80e1f09

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
uses: actions/checkout@v4
3131

3232
- name: Generate Test Matrix
33-
uses: alandefreitas/cpp-actions/[email protected].8
33+
uses: alandefreitas/cpp-actions/[email protected].10
3434
id: cpp-matrix
3535
with:
3636
compilers: |
37-
gcc 14
38-
clang 18
37+
gcc >=14
38+
clang >=18
3939
msvc >=14.40
4040
apple-clang *
4141
standards: '20'
@@ -60,7 +60,7 @@ jobs:
6060
install: |
6161
gcc: git build-essential pkg-config python3 curl openjdk-11-jdk pkg-config libncurses-dev libxml2-utils libxml2-dev
6262
gcc Coverage: git build-essential pkg-config python3 curl openjdk-11-jdk pkg-config libncurses-dev libxml2-utils libxml2-dev lcov
63-
clang: git build-essential pkg-config python3 curl openjdk-11-jdk pkg-config libncurses-dev libxml2-utils libxml2-dev
63+
clang: git build-essential pkg-config python3 curl openjdk-11-jdk pkg-config libncurses-dev libxml2-utils libxml2-dev g++-14=14.2.0-4ubuntu2~24.04
6464
msvc: ''
6565
extra-values: |
6666
llvm-hash: dd7a3d4d798e30dfe53b5bbbbcd9a23c24ea1af9
@@ -125,7 +125,7 @@ jobs:
125125

126126
steps:
127127
- name: Install Git
128-
uses: alandefreitas/cpp-actions/[email protected].8
128+
uses: alandefreitas/cpp-actions/[email protected].10
129129
if: matrix.container != ''
130130
env:
131131
DEBIAN_FRONTEND: 'noninteractive'
@@ -141,7 +141,7 @@ jobs:
141141
uses: actions/checkout@v4
142142

143143
- name: Install Git
144-
uses: alandefreitas/cpp-actions/[email protected].8
144+
uses: alandefreitas/cpp-actions/[email protected].10
145145
if: matrix.container != ''
146146
env:
147147
DEBIAN_FRONTEND: 'noninteractive'
@@ -162,7 +162,7 @@ jobs:
162162
uses: seanmiddleditch/gha-setup-ninja@v5
163163

164164
- name: Setup C++
165-
uses: alandefreitas/cpp-actions/[email protected].8
165+
uses: alandefreitas/cpp-actions/[email protected].10
166166
id: setup-cpp
167167
with:
168168
compiler: ${{ matrix.compiler }}
@@ -178,7 +178,7 @@ jobs:
178178
${{ steps.setup-cpp.outputs.cxx }} --print-target-triple
179179
180180
- name: Install System Packages
181-
uses: alandefreitas/cpp-actions/[email protected].8
181+
uses: alandefreitas/cpp-actions/[email protected].10
182182
if: matrix.compiler != 'msvc'
183183
id: package-install
184184
env:
@@ -238,7 +238,7 @@ jobs:
238238
fi
239239
240240
- name: Install LLVM
241-
uses: alandefreitas/cpp-actions/[email protected].8
241+
uses: alandefreitas/cpp-actions/[email protected].10
242242
if: steps.llvm-cache.outputs.cache-hit != 'true' && steps.llvm-download.outputs.found != 'true'
243243
with:
244244
cmake-version: '>=3.26'
@@ -263,7 +263,7 @@ jobs:
263263
trace-commands: true
264264

265265
- name: Install Duktape
266-
uses: alandefreitas/cpp-actions/[email protected].8
266+
uses: alandefreitas/cpp-actions/[email protected].10
267267
with:
268268
source-dir: ../third-party/duktape
269269
url: https://github.com/svaarala/duktape/releases/download/v2.7.0/duktape-2.7.0.tar.xz
@@ -283,7 +283,7 @@ jobs:
283283
trace-commands: true
284284

285285
- name: Install Fmt
286-
uses: alandefreitas/cpp-actions/[email protected].8
286+
uses: alandefreitas/cpp-actions/[email protected].10
287287
with:
288288
source-dir: ../third-party/fmt
289289
git-repository: https://github.com/fmtlib/fmt
@@ -303,7 +303,7 @@ jobs:
303303
trace-commands: true
304304

305305
- name: Install Libxml2
306-
uses: alandefreitas/cpp-actions/[email protected].8
306+
uses: alandefreitas/cpp-actions/[email protected].10
307307
if: matrix.compiler == 'msvc'
308308
with:
309309
source-dir: ../third-party/libxml2
@@ -360,7 +360,7 @@ jobs:
360360
node-version: '20'
361361

362362
- name: CMake Workflow
363-
uses: alandefreitas/cpp-actions/[email protected].8
363+
uses: alandefreitas/cpp-actions/[email protected].10
364364
with:
365365
cmake-version: '>=3.26'
366366
cxxstd: ${{ matrix.cxxstd }}
@@ -409,7 +409,7 @@ jobs:
409409
retention-days: 1
410410

411411
- name: FlameGraph
412-
uses: alandefreitas/cpp-actions/[email protected].8
412+
uses: alandefreitas/cpp-actions/[email protected].10
413413
if: matrix.time-trace
414414
with:
415415
build-dir: build
@@ -479,7 +479,7 @@ jobs:
479479

480480
steps:
481481
- name: Install packages
482-
uses: alandefreitas/cpp-actions/[email protected].8
482+
uses: alandefreitas/cpp-actions/[email protected].10
483483
id: package-install
484484
with:
485485
apt-get: build-essential asciidoctor cmake bzip2 git
@@ -538,7 +538,7 @@ jobs:
538538
$MRDOCS_ROOT/bin/mrdocs --version
539539
540540
- name: Clone Boost.URL
541-
uses: alandefreitas/cpp-actions/[email protected].8
541+
uses: alandefreitas/cpp-actions/[email protected].10
542542
id: boost-url-clone
543543
with:
544544
branch: develop
@@ -803,7 +803,7 @@ jobs:
803803
scp -o StrictHostKeyChecking=no -r $(pwd)/demos/* [email protected]:$demo_dir/
804804
805805
- name: Create changelog
806-
uses: alandefreitas/cpp-actions/[email protected].8
806+
uses: alandefreitas/cpp-actions/[email protected].10
807807
with:
808808
output-path: CHANGELOG.md
809809
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
@@ -845,7 +845,7 @@ jobs:
845845

846846
steps:
847847
- name: Install packages
848-
uses: alandefreitas/cpp-actions/[email protected].8
848+
uses: alandefreitas/cpp-actions/[email protected].10
849849
id: package-install
850850
with:
851851
apt-get: ${{ matrix.install }}

0 commit comments

Comments
 (0)