From f866f58547376a690f188b28ca8d90a5107a24a6 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 12:26:53 +0200 Subject: [PATCH 1/8] CI/MSYS2: Switch to UCRT64 UCRT64 is now the recommended environment: https://github.com/msys2/setup-msys2/blob/v2.28.0/README.md#msystem --- .github/workflows/msys2.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 0f90a2bc..83d308ed 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -18,9 +18,17 @@ jobs: - uses: actions/checkout@master - uses: msys2/setup-msys2@v2 with: - msystem: MINGW64 + msystem: UCRT64 update: true - install: base-devel git mingw-w64-x86_64-meson mingw-w64-x86_64-ninja mingw-w64-x86_64-pkg-config mingw-w64-x86_64-python3 mingw-w64-x86_64-python3-pip mingw-w64-x86_64-toolchain + install: >- + base-devel + git + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-ninja + mingw-w64-ucrt-x86_64-pkg-config + mingw-w64-ucrt-x86_64-python + mingw-w64-ucrt-x86_64-python-pip + mingw-w64-ucrt-x86_64-toolchain - name: Build run: | meson setup _build From 9372d079d043eefa573e8dd969088eef8cd9fe9c Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 16:45:29 +0200 Subject: [PATCH 2/8] CI/MSVC: Update meson-build github action tp 1.0.3 --- .github/workflows/msvc-env.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msvc-env.yml b/.github/workflows/msvc-env.yml index a4e69c89..2aae710d 100644 --- a/.github/workflows/msvc-env.yml +++ b/.github/workflows/msvc-env.yml @@ -15,9 +15,10 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v1 - uses: seanmiddleditch/gha-setup-vsdevenv@master - - uses: BSFishy/meson-build@v1.0.1 + - uses: BSFishy/meson-build@v1.0.3 with: action: test directory: _build - options: --verbose --fatal-meson-warnings + setup-options: --fatal-meson-warnings + options: --verbose meson-version: 0.54.3 From e8c968f50104b4b673ea343f439bbee64a2285cf Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 16:24:59 +0200 Subject: [PATCH 3/8] CI/MSYS2: Upload meson logs as artifacts Only on failure --- .github/workflows/msys2.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 83d308ed..74a710ad 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -33,3 +33,8 @@ jobs: run: | meson setup _build meson compile -C _build + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: msys2-ci + path: _build/meson-logs/ From d7f57e9eb2a20020f2f4a80565364294a8e93f4b Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 17:17:52 +0200 Subject: [PATCH 4/8] CI/MSVC: Upload Meson logs as artifacts Only on failures --- .github/workflows/msvc-env.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/msvc-env.yml b/.github/workflows/msvc-env.yml index 2aae710d..45a7e4f3 100644 --- a/.github/workflows/msvc-env.yml +++ b/.github/workflows/msvc-env.yml @@ -22,3 +22,8 @@ jobs: setup-options: --fatal-meson-warnings options: --verbose meson-version: 0.54.3 + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: msvc-ci + path: _build/meson-logs/ From 73ece49f033f7b6a555fdb50d0bc7938b9e50535 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 16:41:07 +0200 Subject: [PATCH 5/8] CI/Linux: Update Ubuntu image to 22.04 --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3d71e7fd..31f68d69 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: - - ubuntu-18.04 + - ubuntu-22.04 compiler: - gcc - clang From 6f5d4a43abd68d0fbed3e6afd231bf97e087405e Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 16:41:48 +0200 Subject: [PATCH 6/8] CI/macOS: Update macOS image to 14 (Sonoma) --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c725ef1a..5225ba4c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ jobs: - '-Dglx=no' - '-Degl=no' - '-Dx11=false' - runs-on: macos-10.15 + runs-on: macos-14 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From 9a4ca066fe4088a2897af4c3825d61a8a2a3cbe8 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Tue, 24 Jun 2025 12:36:29 +0200 Subject: [PATCH 7/8] Tests: Explicitly load OpenGL32.DLL --- test/wgl_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/wgl_common.c b/test/wgl_common.c index e8d9c26a..8064bf13 100644 --- a/test/wgl_common.c +++ b/test/wgl_common.c @@ -112,6 +112,8 @@ make_window_and_test(int (*callback)(HDC hdc)) exit(1); } + LoadLibrary ("OPENGL32.DLL"); + /* create window */ hwnd = CreateWindow(class_name, window_name, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, From a6f6c2dcf0e7f62b12efb9e30bf7e229c11f7f00 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 23 Jun 2025 12:29:35 +0200 Subject: [PATCH 8/8] Revert "ci: Drop tests from MSYS2 pipeline" This reverts commit 4c686ff5e34552db0a121adf3054b33b6f708aae. --- .github/workflows/msys2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 74a710ad..f1b2a2c9 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -33,6 +33,7 @@ jobs: run: | meson setup _build meson compile -C _build + meson test -C _build - uses: actions/upload-artifact@v4 if: failure() with: