Skip to content

Commit d0924e5

Browse files
authored
Merge pull request #5619 from ab9rf/gcc-11
use gcc 11 for production builds
2 parents 8c8e39f + 6680780 commit d0924e5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ on:
6666
default: false
6767
gcc-ver:
6868
type: string
69-
default: "10"
69+
default: "11"
7070

7171
jobs:
7272
build-linux64:

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
fail-fast: false
6060
matrix:
6161
include:
62-
- gcc: 10
62+
- gcc: 11 # baseline compatibility with ubuntu LTS 22.04
6363
plugins: "default"
64-
- gcc: 12
64+
- gcc: 12 # highest available in ubuntu 22.04
6565
plugins: "all"
6666

6767
test-windows:
@@ -96,7 +96,7 @@ jobs:
9696
dfhack_repo: ${{ inputs.dfhack_repo }}
9797
dfhack_ref: ${{ inputs.dfhack_ref }}
9898
os: ubuntu
99-
compiler: gcc-10
99+
compiler: gcc-11
100100
plugins: default
101101
config: default
102102

docs/dev/github-workflows.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ tuned our build and test workflows to minimize spurious cache misses and keep
4646
the fast path fast.
4747

4848
Caches are namespaced by key prefixes, and we have one key prefix per build
49-
context. For example, release builds on gcc-10 are kept in one cache namespace,
50-
whereas test builds on gcc-10 are kept separate. MSVC release and test builds
49+
context. For example, release builds on gcc-11 are kept in one cache namespace,
50+
whereas test builds on gcc-11 are kept separate. MSVC release and test builds
5151
similarly have their own namespaces. Each cache has a maximum size that is
5252
enforced by the business logic that writes the cache data.
5353

0 commit comments

Comments
 (0)