1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00

CI: use docker images v13 (#21470)

This release updates mingw and android images, also comes with
clang-tidy preinstalled
This commit is contained in:
Michał Janiszewski
2024-02-27 21:04:33 +01:00
committed by GitHub
parent 11ccbbfc5e
commit b2639add4c
3 changed files with 11 additions and 15 deletions

View File

@@ -156,7 +156,7 @@ jobs:
name: Windows (${{ matrix.platform_name }}) using mingw
runs-on: ubuntu-latest
needs: check-code-formatting
container: openrct2/openrct2-build:12-mingw
container: openrct2/openrct2-build:13-mingw
strategy:
fail-fast: false
matrix:
@@ -305,19 +305,19 @@ jobs:
# For focal the debug information still takes too much space, so reduce amount of debug info to minimum using `-g1` (`-g` means `-g2`), which is enough for backtraces only.
- platform: x86_64
distro: focal
image: openrct2/openrct2-build:12-focal
image: openrct2/openrct2-build:13-focal
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz" -DWITH_TESTS=off
- platform: x86_64
distro: jammy
image: openrct2/openrct2-build:12-jammy
image: openrct2/openrct2-build:13-jammy
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
- platform: x86_64
distro: bullseye
image: openrct2/openrct2-build:12-bullseye
image: openrct2/openrct2-build:13-bullseye
build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
- platform: i686
distro: focal
image: openrct2/openrct2-build:12-focal32
image: openrct2/openrct2-build:13-focal32
build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g1 -gz" -DWITH_TESTS=off
steps:
- name: Checkout
@@ -356,7 +356,7 @@ jobs:
name: Linux (x86_64, AppImage)
runs-on: ubuntu-latest
needs: check-code-formatting
container: openrct2/openrct2-build:12-focal
container: openrct2/openrct2-build:13-focal
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -414,7 +414,7 @@ jobs:
name: Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang
runs-on: ubuntu-latest
needs: check-code-formatting
container: openrct2/openrct2-build:12-jammy
container: openrct2/openrct2-build:13-jammy
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -430,7 +430,7 @@ jobs:
name: Linux (Debug) using clang, coverage enabled
runs-on: ubuntu-latest
needs: check-code-formatting
container: openrct2/openrct2-build:12-jammy
container: openrct2/openrct2-build:13-jammy
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -471,7 +471,7 @@ jobs:
name: Android
runs-on: ubuntu-latest
needs: check-code-formatting
container: openrct2/openrct2-build:12-android
container: openrct2/openrct2-build:13-android
steps:
- name: Checkout
uses: actions/checkout@v4

View File

@@ -12,7 +12,7 @@ on:
jobs:
clang-tidy-check:
runs-on: ubuntu-latest
container: openrct2/openrct2-build:12-jammy
container: openrct2/openrct2-build:13-jammy
steps:
- uses: actions/checkout@v4
- name: ccache
@@ -22,10 +22,6 @@ jobs:
- name: Setup CCache environment
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
- name: Get clang-tidy
run: |
apt-get update
apt-get install -y clang-tidy
- uses: ZehMatt/clang-tidy-annotations@v1
with:
build_dir: 'build'

View File

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 31
buildToolsVersion "34.0.0"
ndkVersion "26.1.10909125" // Latest r26b (LTS), to be synced with CI container image
ndkVersion "26.2.11394342" // Latest r26c (LTS), to be synced with CI container image
namespace "io.openrct2"
defaultConfig {
applicationId 'io.openrct2'