From 9238955b21391b20c27cdb4f538c2264908af0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Thu, 6 Jan 2022 00:09:24 +0100
Subject: [PATCH] Add new CI images (Focal, Bullseye) (#16382)

This adds new images for use in CI, as preparation towards C++20
support (https://github.com/OpenRCT2/OpenRCT2/issues/15501).
---
 .github/workflows/ci.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3e0c3ef4c..844ded3828 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -209,7 +209,7 @@ jobs:
               echo 'Not going to push build'
           fi
   linux-portable:
-    name: Linux (${{ matrix.platform }}, portable)
+    name: Linux (${{ matrix.platform }}, ${{ matrix.distro }}, portable)
     runs-on: ubuntu-latest
     needs: check-code-formatting
     container:
@@ -220,10 +220,22 @@ jobs:
         platform: [x86_64, i686]
         include:
           - platform: x86_64
+            distro: bionic
             image: openrct2/openrct2-build:0.3.1-bionic
             cache_key: linux-portable
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz"
+          - platform: x86_64
+            distro: focal
+            image: openrct2/openrct2-build:5-focal
+            cache_key: linux-portable
+            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz"
+          - platform: x86_64
+            distro: bullseye
+            image: openrct2/openrct2-build:5-bullseye
+            cache_key: linux-portable
+            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz"
           - platform: i686
+            distro: bionic
             image: openrct2/openrct2-build:0.3.1-bionic32
             cache_key: linux-portable-32
             build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -gz"
@@ -239,20 +251,21 @@ jobs:
       - name: Build OpenRCT2
         run: . scripts/setenv -q && build -DWITH_TESTS=on -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON ${{ matrix.build_flags }}
       - name: Build artifacts
-        run: . scripts/setenv -q && build-portable artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.platform }}.tar.gz bin/install/usr
+        run: . scripts/setenv -q && build-portable artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.distro }}-${{ matrix.platform }}.tar.gz bin/install/usr
       - name: Upload artifacts (CI)
         uses: actions/upload-artifact@v2
         with:
-          name: OpenRCT2-${{ runner.os }}-${{ matrix.platform }}
+          name: OpenRCT2-${{ runner.os }}-${{ matrix.distro }}-${{ matrix.platform }}
           path: artifacts
           if-no-files-found: error
       - name: Run Tests
         run: . scripts/setenv -q && run-tests
       - name: Upload artifacts (openrct2.org)
+        if: matrix.distro == 'bionic' # Need to get openrct2.org updated before other distros can be enabled
         run: |
           . scripts/setenv -q
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-              upload-build artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.platform }}.tar.gz linux-${{ matrix.platform }} $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+              upload-build artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.distro }}-${{ matrix.platform }}.tar.gz linux-${{ matrix.platform }} $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
           else
               echo 'Not going to push build'
           fi