Skip to content

Commit f8ee73b

Browse files
committed
update from gcc-12 to gcc-14 for newest gcc asan build
1 parent 60cb89b commit f8ee73b

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/matrix.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,16 @@ concurrency:
3838
# For github provided runners: https://github.com/actions/runner-images
3939
# See also our publicized docs about compiler support: https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/c++/COMPILER_SUPPORT.md
4040
#
41-
# At the time of writing (Jan 2025), the feature matrix for the above criteria looks like this:
41+
# At the time of writing (June 2025), the feature matrix for the above criteria looks like this:
4242
# | name | OS | compiler | newest/ oldest | tiles | sound | localize | cmake | backtrace | lto | sanitize | mods |
4343
# | ------------------------------------ | -------- | -------- | -------------- | ----- | ----- | -------- | ----- | --------- | --- | -------- | ---- |
4444
# | Basic Build and Test | ubuntu | clang-13 | oldest (clang) | | | yes | | | | | yes |
4545
# | Clang 18, Ubuntu, Tiles, ASan | ubuntu | clang-18 | newest (clang) | yes | | yes | | yes | | address | |
4646
# | GCC 9, Curses, LTO | ubuntu | gcc-9 | oldest (gcc) | | | yes | | yes | yes | | |
47-
# | GCC 12, Ubuntu, Curses, ASan | ubuntu | gcc-12 | newest* (gcc) | | | yes | | | | address | |
47+
# | GCC 14, Ubuntu, Curses, ASan | ubuntu | gcc-14 | newest (gcc) | | | yes | | | | address | |
4848
# | GCC 9, Ubuntu, Tiles, Sound, CMake | ubuntu | gcc-9 | oldest (gcc) | yes | yes | | yes | | | | |
4949
# | macOS 13, Apple Clang 15 | macOS 13 | apple clang-15 | N/A | yes | yes | yes | | | | | |
5050
# | Windows (in msvc-full-features.yml) | windows | msvc | N/A | yes | yes | yes | | yes? | | | |
51-
#
52-
# gcc-12 is not actually newest. gcc-14 exists, but it's failing the asan tests on newer (24.04) ubuntu runners for whatever reason.
53-
# See https://github.com/CleverRaven/Cataclysm-DDA/pull/79517#issuecomment-2635790180 for a tiny bit more context
5451

5552
jobs:
5653
skip-duplicates-code:
@@ -161,7 +158,7 @@ jobs:
161158
ccache_limit: 6G
162159
ccache_key: linux-llvm-18-asan
163160

164-
- compiler: g++-12
161+
- compiler: g++-14
165162
os: ubuntu-latest
166163
cmake: 0
167164
tiles: 0
@@ -170,9 +167,9 @@ jobs:
170167
native: linux64
171168
pch: 1
172169
sanitize: address
173-
title: GCC 12, Ubuntu, Curses, ASan
170+
title: GCC 14, Ubuntu, Curses, ASan
174171
ccache_limit: 6.5G
175-
ccache_key: linux-gcc-12-asan
172+
ccache_key: linux-gcc-14-asan
176173

177174
- compiler: g++-9
178175
os: ubuntu-22.04

0 commit comments

Comments
 (0)