From 8cf3ea1588bbb17fb2f16e07ce94610d8c8a8aa2 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 31 May 2025 16:22:50 +0200 Subject: [PATCH 1/5] ci: update macos arm64 runner image to macos-15 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68e0e674..805a3516 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,7 +90,7 @@ jobs: - name: MacOS (Arm64) os: macos - os-version: 14 + os-version: 15 arm: true shell: bash fatal_warnings: true From b28d2588fd0c05c5ebe58878a65fc7ec3cdc48e6 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 31 May 2025 16:24:04 +0200 Subject: [PATCH 2/5] ci: update windows server runner image to windows-2025 --- .github/workflows/build.yml | 8 ++++---- .github/workflows/windows_installer.yml | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 805a3516..99838c8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: config: - name: Windows MSVC (dynamic) os: windows - os-version: 2022 + os-version: 2025 environment: msvc shell: pwsh static: false @@ -25,7 +25,7 @@ jobs: - name: Windows MSVC (static) os: windows - os-version: 2022 + os-version: 2025 environment: msvc shell: pwsh static: true @@ -33,7 +33,7 @@ jobs: - name: Windows MingGW os: windows - os-version: 2022 + os-version: 2025 environment: mingw architecture: x86_64 shell: 'msys2 {0}' @@ -41,7 +41,7 @@ jobs: - name: Windows UCRT os: windows - os-version: 2022 + os-version: 2025 environment: ucrt architecture: ucrt-x86_64 shell: 'msys2 {0}' diff --git a/.github/workflows/windows_installer.yml b/.github/workflows/windows_installer.yml index f3ed85aa..77f03b57 100644 --- a/.github/workflows/windows_installer.yml +++ b/.github/workflows/windows_installer.yml @@ -9,8 +9,7 @@ on: jobs: installer: name: Windows MSVC Installer - runs-on: windows-2022 - + runs-on: windows-2025 defaults: run: shell: pwsh From 00bce77abdb3137ebfdfc8d67e3138c4d0fbb0b5 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 31 May 2025 18:07:14 +0200 Subject: [PATCH 3/5] fix: install NSIS manually windows-2025 doesn't have NSIS pre-installed, so it needs to be installed manually --- .github/workflows/windows_installer.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows_installer.yml b/.github/workflows/windows_installer.yml index 77f03b57..2a30a604 100644 --- a/.github/workflows/windows_installer.yml +++ b/.github/workflows/windows_installer.yml @@ -29,15 +29,10 @@ jobs: run: | pip install meson - - name: Download EnVar plugin for NSIS - uses: carlosperate/download-file-action@v2 + - name: Install NSIS with EnVar plugin + uses: repolevedavaj/install-nsis@v1.0.1 with: - file-url: https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip - file-name: envar_plugin.zip - location: ${{ github.workspace }} - - - name: Extract EnVar plugin - run: 7z x "-oC:/Program Files (x86)/NSIS" "${{ github.workspace }}/envar_plugin.zip" + nsis-version: '3.11' - name: Configure run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dbuild_installer=true -Drun_in_ci=true From a6684e17cfe39ca9d4d3d47760ac437c8b9954eb Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sun, 1 Jun 2025 03:50:44 +0200 Subject: [PATCH 4/5] fix: fix nsis installer action, so that it works on windows-2025 --- .github/workflows/windows_installer.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows_installer.yml b/.github/workflows/windows_installer.yml index 2a30a604..5ceac172 100644 --- a/.github/workflows/windows_installer.yml +++ b/.github/workflows/windows_installer.yml @@ -28,9 +28,10 @@ jobs: - name: Setup meson run: | pip install meson - + + # TODO: use the upstream version, once everything is merged - name: Install NSIS with EnVar plugin - uses: repolevedavaj/install-nsis@v1.0.1 + uses: Totto16/install-nsis@c2c3e016bf85cd88bb9f435cc7966422ea2766de with: nsis-version: '3.11' From 7c46e8067c19d0fe8448280828282ba7e305e2ea Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sun, 1 Jun 2025 23:48:06 +0200 Subject: [PATCH 5/5] fix: fix nsis installer action, so that it works on windows-2025, use upstream action --- .github/workflows/windows_installer.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows_installer.yml b/.github/workflows/windows_installer.yml index 5ceac172..8e86f817 100644 --- a/.github/workflows/windows_installer.yml +++ b/.github/workflows/windows_installer.yml @@ -28,10 +28,9 @@ jobs: - name: Setup meson run: | pip install meson - - # TODO: use the upstream version, once everything is merged + - name: Install NSIS with EnVar plugin - uses: Totto16/install-nsis@c2c3e016bf85cd88bb9f435cc7966422ea2766de + uses: repolevedavaj/install-nsis@v1.0.3 with: nsis-version: '3.11'