Skip to content

Commit bfa9aaa

Browse files
authored
Merge pull request #412 from pq-code-package/gcc15
nix/CI: Add gcc15 tests
2 parents 108d2d3 + 2120441 commit bfa9aaa

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,14 @@ jobs:
190190
c23: True
191191
opt: all
192192
examples: False
193+
- name: gcc-15
194+
shell: ci_gcc15
195+
# TODO: Add this once gcc15 is supported in nix on aarch64-Darwin
196+
darwin: False
197+
c17: True
198+
c23: True
199+
opt: all
200+
examples: true
193201
- name: clang-18
194202
shell: ci_clang18
195203
darwin: True
@@ -344,7 +352,7 @@ jobs:
344352
with:
345353
gh_token: ${{ secrets.GITHUB_TOKEN }}
346354
compile_mode: native
347-
nix-shell: ci_valgrind-varlat_gcc14
355+
nix-shell: ci_valgrind-varlat_gcc15
348356
nix-cache: false
349357
opt: all
350358
cflags: "${{ matrix.cflags }}"

.github/workflows/ct-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
- ci_valgrind-varlat_gcc12
3636
- ci_valgrind-varlat_gcc13
3737
- ci_valgrind-varlat_gcc14
38+
- ci_valgrind-varlat_gcc15
3839
runs-on: ${{ matrix.system }}
3940
steps:
4041
- 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
@@ -118,6 +118,7 @@
118118
devShells.ci_gcc12 = util.mkShellWithCC' pkgs.gcc12;
119119
devShells.ci_gcc13 = util.mkShellWithCC' pkgs.gcc13;
120120
devShells.ci_gcc14 = util.mkShellWithCC' pkgs.gcc14;
121+
devShells.ci_gcc15 = util.mkShellWithCC' pkgs.gcc15;
121122

122123
# valgrind with a patch for detecting variable-latency instructions
123124
devShells.ci_valgrind-varlat_clang14 = util.mkShellWithCC_valgrind' pkgs.clang_14;
@@ -134,6 +135,7 @@
134135
devShells.ci_valgrind-varlat_gcc12 = util.mkShellWithCC_valgrind' pkgs.gcc12;
135136
devShells.ci_valgrind-varlat_gcc13 = util.mkShellWithCC_valgrind' pkgs.gcc13;
136137
devShells.ci_valgrind-varlat_gcc14 = util.mkShellWithCC_valgrind' pkgs.gcc14;
138+
devShells.ci_valgrind-varlat_gcc15 = util.mkShellWithCC_valgrind' pkgs.gcc15;
137139
};
138140
flake = {
139141
devShell.x86_64-linux =

0 commit comments

Comments
 (0)