From b2639add4cc600ffa31a30128df46cfea48b2375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Tue, 27 Feb 2024 21:04:33 +0100
Subject: [PATCH] CI: use docker images v13 (#21470)

This release updates mingw and android images, also comes with
clang-tidy preinstalled
---
 .github/workflows/ci.yml              | 18 +++++++++---------
 .github/workflows/clang-tidy.yml      |  6 +-----
 src/openrct2-android/app/build.gradle |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 392f8d9328..ad34238222 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index f83bf6a02b..67b0d4498e 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -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'
diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle
index ab7d403080..02c378757b 100644
--- a/src/openrct2-android/app/build.gradle
+++ b/src/openrct2-android/app/build.gradle
@@ -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'