Skip to content

Commit e85fbe1

Browse files
committed
ci: installer, don't use matrix build, as it is only one config
1 parent 5f3f64c commit e85fbe1

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

.github/workflows/installer.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,30 @@ on:
88

99
jobs:
1010
installer:
11-
name: ${{ matrix.config.name }}
12-
runs-on: ${{ matrix.config.os }}-${{ matrix.config.os-version }}
11+
name: Windows MSVC Installer
12+
runs-on: windows-2022
1313

14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
config:
18-
- name: Windows MSVC Installer
19-
os: windows
20-
os-version: 2022
21-
msvc: true
22-
buildtype: release
23-
library_type: static
24-
shell: pwsh
2514
defaults:
2615
run:
27-
shell: ${{ matrix.config.shell }}
16+
shell: pwsh
2817

2918
steps:
3019
- uses: actions/checkout@v4
3120
with:
3221
fetch-depth: '0'
3322

3423
- name: Setup MSVC (Windows)
35-
if: matrix.config.os == 'windows' && matrix.config.msvc == true
3624
uses: TheMrMilchmann/setup-msvc-dev@v3
3725
with:
3826
arch: x64
3927
toolset: '14.41'
4028

4129
- name: Setup meson
42-
if: matrix.config.os != 'macos'
4330
run: |
4431
pip install meson
4532
4633
- name: Configure
47-
run: meson setup build -Dbuildtype=${{ matrix.config.buildtype }} -Ddefault_library=${{ matrix.config.library_type }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }} -Dbuild_installer=true
34+
run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dbuild_installer=true
4835

4936
- name: Build
5037
run: meson compile -C build
@@ -65,7 +52,6 @@ jobs:
6552
6653
- name: Upload artifacts - Windows
6754
uses: actions/upload-artifact@v4
68-
if: matrix.config.os == 'windows'
6955
with:
70-
name: ${{ matrix.config.name }}
56+
name: OOpetris Setup
7157
path: tools/installer/OOPetris Setup.exe

0 commit comments

Comments
 (0)