diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e050fb0f54..73c25c02e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -293,7 +293,7 @@ jobs: echo 'Not going to push build' fi linux-portable: - name: Linux (${{ matrix.platform }}, ${{ matrix.distro }}, portable) + name: ${{ matrix.distro }} Linux (${{ matrix.release }}, ${{ matrix.platform }}, portable) runs-on: ubuntu-latest needs: check-code-formatting container: ${{ matrix.image }} @@ -303,15 +303,18 @@ jobs: include: # Use `-fno-var-tracking-assignments` to reduce amount of produced debug information. This is necessary due to 100MiB limit of GitHub / openrct2.org API. - platform: x86_64 - distro: jammy + distro: Ubuntu + release: jammy image: openrct2/openrct2-build:14-jammy build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" - platform: x86_64 - distro: bullseye + distro: Debian + release: bullseye image: openrct2/openrct2-build:14-bullseye build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off - platform: i686 - distro: jammy + distro: Ubuntu + release: jammy image: openrct2/openrct2-build:14-jammy32 build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g -gz" -DWITH_TESTS=off steps: @@ -348,7 +351,7 @@ jobs: echo 'Not going to push build' fi linux-appimage: - name: Linux (x86_64, AppImage) + name: Ubuntu Linux (AppImage, x86_64) runs-on: ubuntu-latest needs: check-code-formatting container: openrct2/openrct2-build:14-jammy @@ -381,7 +384,7 @@ jobs: echo 'Not going to push build' fi linux-docker: - name: Linux (docker) + name: Ubuntu Linux (Docker) needs: check-code-formatting if: github.repository == 'OpenRCT2/OpenRCT2' runs-on: ubuntu-latest @@ -406,7 +409,7 @@ jobs: echo 'Image not pushed' fi linux-clang: - name: Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang + name: Ubuntu Linux (jammy, debug, [http, network, flac, vorbis OpenGL] disabled) using clang runs-on: ubuntu-latest needs: check-code-formatting container: openrct2/openrct2-build:14-jammy @@ -422,7 +425,7 @@ jobs: - name: Build OpenRCT2 run: . scripts/setenv && build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DDISABLE_NETWORK=ON -DDISABLE_HTTP=ON -DDISABLE_FLAC=ON -DDISABLE_VORBIS=ON -DDISABLE_OPENGL=ON linux-clang-tests: - name: Linux (Debug) using clang, coverage enabled + name: Ubuntu Linux (debug) using clang, coverage enabled runs-on: ubuntu-latest needs: check-code-formatting container: openrct2/openrct2-build:14-jammy