From e42227066f8766cd1a030fa597444cc839bb4cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 1 Apr 2022 07:42:50 +0200 Subject: [PATCH 1/5] Add Ubuntu Jammy to build matrix, update images --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b6be66b1f..61a3ecc158 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: name: Windows (${{ matrix.platform_name }}) using mingw runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:4-mingw + container: openrct2/openrct2-build:8-mingw strategy: fail-fast: false matrix: @@ -251,11 +251,15 @@ jobs: build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz" -DWITH_TESTS=off - platform: x86_64 distro: focal - image: openrct2/openrct2-build:5-focal + image: openrct2/openrct2-build:8-focal + build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz" + - platform: x86_64 + distro: jammy + image: openrct2/openrct2-build:8-jammy build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz" - platform: x86_64 distro: bullseye - image: openrct2/openrct2-build:5-bullseye + image: openrct2/openrct2-build:8-bullseye build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz" - platform: i686 distro: bionic From 80a142c5758d690199b2245cd5aba532db8543ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 21 May 2022 00:05:29 +0200 Subject: [PATCH 2/5] Disable NT5.1 jobs as they haven't worked in a while As much as I'd love to continue supporting NT5.1 mingw job as something that could potentially run on ReactOS, I think it's time for it to go. The sad truth is those builds were not able to run on such systems for a while, no matter how much we tried to keep our project not polluted with modern symbols, our dependencies haven't been so pristine. The latest bug with those relates to how the static executable gets created and even after solving that issue, there comes another one that isn't ours but a play between freetype and GCC which I'm not interested in solving. NT5.1 is no more. It's ceased to be. NT5.1's expired and gone to meet its maker. --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61a3ecc158..e2988c8e48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,16 +109,12 @@ jobs: strategy: fail-fast: false matrix: - platform: [win32, NT5.1] + platform: [win32] include: - platform: win32 platform_name: win32 cache_key: windows-mingw - build_flags: -DBUILD_SHARED_LIBS=ON -DENABLE_SCRIPTING=OFF - - platform: NT5.1 - platform_name: win32, NT5.1 - cache_key: windows-mingw-nt51 - build_flags: -DDISABLE_HTTP=Off -DENABLE_SCRIPTING=ON -DCMAKE_CXX_FLAGS="-Wno-error=cast-function-type -Wno-error=unused-function" -DSTATIC=on -DMINGW_TARGET_NT5_1=ON + build_flags: -DBUILD_SHARED_LIBS=ON -DENABLE_SCRIPTING=ON steps: - name: Checkout uses: actions/checkout@v3 From 006628727ef8d1bf55021b0adfca440e51b4d013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 21 May 2022 00:17:39 +0200 Subject: [PATCH 3/5] Update more CI images --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2988c8e48..495948e909 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -297,7 +297,7 @@ jobs: name: Linux (x64, AppImage) runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:0.3.1-bionic + container: openrct2/openrct2-build:8-focal steps: - name: Checkout uses: actions/checkout@v3 @@ -358,7 +358,7 @@ jobs: name: Linux (Debug, [http, network, OpenGL] disabled) using clang runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:0.3.1-bionic + container: openrct2/openrct2-build:8-jammy steps: - name: Checkout uses: actions/checkout@v3 @@ -374,7 +374,7 @@ jobs: name: Android runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:4-android + container: openrct2/openrct2-build:8-android steps: - name: Checkout uses: actions/checkout@v3 From d51ed4f17879a8462d505cf896cdb3db27bd722d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 22 May 2022 23:39:52 +0200 Subject: [PATCH 4/5] Upload more Linux builds to openrct2.org --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 495948e909..7bf354489d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -285,8 +285,8 @@ jobs: - 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: | + # Build identification code: https://github.com/Limetric/OpenRCT2.org/blob/e5b738f3dadcc5a3b78e8dfd434756ff31eaa1d3/src/misc/releaseAsset.js#L94-L116 . scripts/setenv -q if [[ "$OPENRCT2_PUSH" == "true" ]]; then upload-build artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.distro }}-${{ matrix.platform }}.tar.gz linux-${{ matrix.platform }} $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH From f218d38ff8bf63132a4e81991395565f90ed9f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 22 May 2022 23:42:17 +0200 Subject: [PATCH 5/5] Build 32-bit with Focal --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bf354489d..399e51a363 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -258,8 +258,8 @@ jobs: image: openrct2/openrct2-build:8-bullseye build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz" - platform: i686 - distro: bionic - image: openrct2/openrct2-build:4-bionic32 + distro: focal + image: openrct2/openrct2-build:8-focal32 build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g -gz" -DWITH_TESTS=off steps: - name: Checkout