Skip to content

Commit 98d9422

Browse files
authored
Merge pull request #227 from OpenBrickProtocolFoundation/update_ci_images
Update CI image versions
2 parents aa0518e + 7c46e80 commit 98d9422

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ jobs:
1717
config:
1818
- name: Windows MSVC (dynamic)
1919
os: windows
20-
os-version: 2022
20+
os-version: 2025
2121
environment: msvc
2222
shell: pwsh
2323
static: false
2424
fatal_warnings: false # TODO: enable fatal warnings, once cpp-httplib is patched either by ourselves or by the maintainers
2525

2626
- name: Windows MSVC (static)
2727
os: windows
28-
os-version: 2022
28+
os-version: 2025
2929
environment: msvc
3030
shell: pwsh
3131
static: true
3232
fatal_warnings: false # TODO: enable fatal warnings, once cpp-httplib is patched either by ourselves or by the maintainers
3333

3434
- name: Windows MingGW
3535
os: windows
36-
os-version: 2022
36+
os-version: 2025
3737
environment: mingw
3838
architecture: x86_64
3939
shell: 'msys2 {0}'
4040
fatal_warnings: true
4141

4242
- name: Windows UCRT
4343
os: windows
44-
os-version: 2022
44+
os-version: 2025
4545
environment: ucrt
4646
architecture: ucrt-x86_64
4747
shell: 'msys2 {0}'
@@ -90,7 +90,7 @@ jobs:
9090

9191
- name: MacOS (Arm64)
9292
os: macos
93-
os-version: 14
93+
os-version: 15
9494
arm: true
9595
shell: bash
9696
fatal_warnings: true

.github/workflows/windows_installer.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99
jobs:
1010
installer:
1111
name: Windows MSVC Installer
12-
runs-on: windows-2022
13-
12+
runs-on: windows-2025
1413
defaults:
1514
run:
1615
shell: pwsh
@@ -30,15 +29,10 @@ jobs:
3029
run: |
3130
pip install meson
3231
33-
- name: Download EnVar plugin for NSIS
34-
uses: carlosperate/download-file-action@v2
32+
- name: Install NSIS with EnVar plugin
33+
uses: repolevedavaj/[email protected]
3534
with:
36-
file-url: https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip
37-
file-name: envar_plugin.zip
38-
location: ${{ github.workspace }}
39-
40-
- name: Extract EnVar plugin
41-
run: 7z x "-oC:/Program Files (x86)/NSIS" "${{ github.workspace }}/envar_plugin.zip"
35+
nsis-version: '3.11'
4236

4337
- name: Configure
4438
run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dbuild_installer=true -Drun_in_ci=true

0 commit comments

Comments
 (0)