Skip to content

Commit 0632f8e

Browse files
committed
nix/CI: Add gcc15
Signed-off-by: Hanno Becker <[email protected]>
1 parent 03b1a0c commit 0632f8e

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@ jobs:
228228
c23: True
229229
opt: all
230230
examples: true
231+
- name: gcc-15
232+
shell: ci_gcc15
233+
# TODO: Add this once gcc15 is supported in nix on aarch64-Darwin
234+
darwin: False
235+
c17: True
236+
c23: True
237+
opt: all
238+
examples: true
231239
- name: clang-18
232240
shell: ci_clang18
233241
darwin: True
@@ -382,7 +390,7 @@ jobs:
382390
with:
383391
gh_token: ${{ secrets.GITHUB_TOKEN }}
384392
compile_mode: native
385-
nix-shell: ci_valgrind-varlat_gcc14
393+
nix-shell: ci_valgrind-varlat_gcc15
386394
nix-cache: false
387395
opt: all
388396
cflags: "${{ matrix.cflags }}"
@@ -535,6 +543,8 @@ jobs:
535543
compiler:
536544
- name: gcc-14
537545
shell: ci_gcc14
546+
- name: gcc-15
547+
shell: ci_gcc15
538548
- name: clang-19
539549
shell: ci_clang19
540550
# On AArch64 -fcf-protection is not supported anyway

.github/workflows/ct-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
- ci_valgrind-varlat_gcc12
3434
- ci_valgrind-varlat_gcc13
3535
- ci_valgrind-varlat_gcc14
36+
- ci_valgrind-varlat_gcc15
3637
runs-on: ${{ matrix.system }}
3738
steps:
3839
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
devShells.ci_gcc12 = util.mkShellWithCC' pkgs.gcc12;
141141
devShells.ci_gcc13 = util.mkShellWithCC' pkgs.gcc13;
142142
devShells.ci_gcc14 = util.mkShellWithCC' pkgs.gcc14;
143+
devShells.ci_gcc15 = util.mkShellWithCC' pkgs.gcc15;
143144

144145
# valgrind with a patch for detecting variable-latency instructions
145146
devShells.ci_valgrind-varlat_clang14 = util.mkShellWithCC_valgrind' pkgs.clang_14;
@@ -156,6 +157,7 @@
156157
devShells.ci_valgrind-varlat_gcc12 = util.mkShellWithCC_valgrind' pkgs.gcc12;
157158
devShells.ci_valgrind-varlat_gcc13 = util.mkShellWithCC_valgrind' pkgs.gcc13;
158159
devShells.ci_valgrind-varlat_gcc14 = util.mkShellWithCC_valgrind' pkgs.gcc14;
160+
devShells.ci_valgrind-varlat_gcc15 = util.mkShellWithCC_valgrind' pkgs.gcc15;
159161
};
160162
flake = {
161163
devShell.x86_64-linux =

0 commit comments

Comments
 (0)