Skip to content

Commit 81e956b

Browse files
authored
Add Trixie (OpenRCT2#24950)
* Use CI images v23, add trixie * Use per-linux-release cache key
1 parent bdf8128 commit 81e956b

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
check-code-formatting:
130130
name: Check code formatting
131131
runs-on: ubuntu-latest
132-
container: openrct2/openrct2-build:22-format
132+
container: openrct2/openrct2-build:23-format
133133
defaults:
134134
run:
135135
shell: sh
@@ -315,7 +315,7 @@ jobs:
315315
name: Windows (${{ matrix.platform_name }}) using mingw
316316
runs-on: ubuntu-latest
317317
needs: [check-code-formatting, build_variables]
318-
container: openrct2/openrct2-build:22-mingw
318+
container: openrct2/openrct2-build:23-mingw
319319
strategy:
320320
fail-fast: false
321321
matrix:
@@ -453,20 +453,25 @@ jobs:
453453
- platform: x86_64
454454
distro: Ubuntu
455455
release: noble
456-
image: openrct2/openrct2-build:22-noble
456+
image: openrct2/openrct2-build:23-noble
457457
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
458458
- platform: x86_64
459459
distro: Debian
460460
release: bookworm
461-
image: openrct2/openrct2-build:22-bookworm
461+
image: openrct2/openrct2-build:23-bookworm
462+
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
463+
- platform: x86_64
464+
distro: Debian
465+
release: trixie
466+
image: openrct2/openrct2-build:23-trixie
462467
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
463468
steps:
464469
- name: Checkout
465470
uses: actions/checkout@v4
466471
- name: ccache
467472
uses: hendrikmuhs/ccache-action@v1.2.18
468473
with:
469-
key: linux-${{ matrix.platform }}-${{ matrix.distro }}
474+
key: linux-${{ matrix.platform }}-${{ matrix.distro }}-${{ matrix.release }}
470475
- name: Get pre-reqs
471476
run: . scripts/setenv && get-discord-rpc
472477
- name: Install GCC problem matcher
@@ -489,7 +494,7 @@ jobs:
489494
name: Ubuntu Linux (AppImage, x86_64)
490495
runs-on: ubuntu-latest
491496
needs: [check-code-formatting, build_variables]
492-
container: openrct2/openrct2-build:22-jammy
497+
container: openrct2/openrct2-build:23-jammy
493498
steps:
494499
- name: Checkout
495500
uses: actions/checkout@v4
@@ -544,7 +549,7 @@ jobs:
544549
name: Ubuntu Linux (noble, debug, [http, network, flac, vorbis OpenGL] disabled) using clang
545550
runs-on: ubuntu-latest
546551
needs: [check-code-formatting, build_variables]
547-
container: openrct2/openrct2-build:22-noble
552+
container: openrct2/openrct2-build:23-noble
548553
steps:
549554
- name: Checkout
550555
uses: actions/checkout@v4
@@ -560,14 +565,14 @@ jobs:
560565
name: Ubuntu Linux (debug) using clang, coverage enabled
561566
runs-on: ubuntu-latest
562567
needs: [check-code-formatting, build_variables]
563-
container: openrct2/openrct2-build:22-noble
568+
container: openrct2/openrct2-build:23-noble
564569
steps:
565570
- name: Checkout
566571
uses: actions/checkout@v4
567572
- name: ccache
568573
uses: hendrikmuhs/ccache-action@v1.2.18
569574
with:
570-
key: linux-clang
575+
key: linux-clang-tests
571576
- name: Install GCC problem matcher
572577
uses: ammaraskar/gcc-problem-matcher@master
573578
- name: Build OpenRCT2
@@ -601,7 +606,7 @@ jobs:
601606
name: Android
602607
runs-on: ubuntu-latest
603608
needs: [check-code-formatting, build_variables]
604-
container: openrct2/openrct2-build:22-android
609+
container: openrct2/openrct2-build:23-android
605610
steps:
606611
- name: Checkout
607612
uses: actions/checkout@v4
@@ -634,7 +639,7 @@ jobs:
634639
name: Emscripten
635640
runs-on: ubuntu-latest
636641
needs: [check-code-formatting, build_variables]
637-
container: openrct2/openrct2-build:22-emscripten
642+
container: openrct2/openrct2-build:23-emscripten
638643
steps:
639644
- name: Checkout
640645
uses: actions/checkout@v4

0 commit comments

Comments
 (0)