Skip to content

Commit f0ae1ba

Browse files
committed
ci: use runner.os for generic OS detection
Use the built-in runner.os context variable when we only need to identify the category and do not care about the specific image used under the category.
1 parent a6ad08e commit f0ae1ba

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ jobs:
9999
pip install meson==1.7.2
100100
101101
- name: Setup MSVC
102-
if: startsWith(matrix.config.os, 'windows-') && matrix.config.msvc == true
102+
if: runner.os == 'Windows' && matrix.config.msvc == true
103103
uses: ilammy/msvc-dev-cmd@v1
104104
with:
105105
arch: ${{ matrix.config.arch }}
106106

107107
- name: Install dependencies (Windows)
108-
if: startsWith(matrix.config.os, 'windows-')
108+
if: runner.os == 'Windows'
109109
run: |
110110
choco install ninja innosetup
111111
@@ -125,7 +125,7 @@ jobs:
125125
popd
126126
127127
- name: Install dependencies (MacOS)
128-
if: startsWith(matrix.config.os, 'macos-')
128+
if: runner.os == 'macOS'
129129
run: |
130130
export HOMEBREW_NO_INSTALL_CLEANUP=1
131131
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
@@ -138,7 +138,7 @@ jobs:
138138
brew install pulseaudio # NO OpenAL in github CI
139139
140140
- name: Install dependencies (Linux)
141-
if: startsWith(matrix.config.os, 'ubuntu-')
141+
if: runner.os == 'Linux'
142142
run: |
143143
sudo apt-get update
144144
sudo apt-get install ninja-build build-essential libx11-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libcurl4-openssl-dev libuchardet-dev libgtest-dev libgmock-dev libwxgtk3.2-dev
@@ -166,49 +166,49 @@ jobs:
166166

167167
# Windows artifacts
168168
- name: Generate Windows installer
169-
if: startsWith(matrix.config.os, 'windows-')
169+
if: runner.os == 'Windows'
170170
env:
171171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
172172
run:
173173
meson compile win-installer -C build
174174

175175
- name: Generate Windows portable installer
176-
if: startsWith(matrix.config.os, 'windows-')
176+
if: runner.os == 'Windows'
177177
run: cd build && ninja win-portable
178178

179179
- name: Upload artifacts - win_installer
180180
uses: actions/upload-artifact@v4
181-
if: startsWith(matrix.config.os, 'windows-')
181+
if: runner.os == 'Windows'
182182
with:
183183
name: ${{ matrix.config.name }} - installer
184184
path: build/Aegisub-*.exe
185185
if-no-files-found: error
186186

187187
- name: Upload artifacts - portable.zip
188188
uses: actions/upload-artifact@v4
189-
if: startsWith(matrix.config.os, 'windows-')
189+
if: runner.os == 'Windows'
190190
with:
191191
name: ${{ matrix.config.name }} - portable
192192
path: build/aegisub-portable-64.zip
193193

194194
# macOS artifacts
195195
- name: Generate macOS installer
196-
if: startsWith(matrix.config.os, 'macos-')
196+
if: runner.os == 'macOS'
197197
run: |
198198
meson compile osx-bundle -C build
199199
meson compile osx-build-dmg -C build
200200
201201
- name: Upload artifacts - macOS dmg
202202
uses: actions/upload-artifact@v4
203-
if: startsWith(matrix.config.os, 'macos-')
203+
if: runner.os == 'macOS'
204204
with:
205205
name: ${{ matrix.config.name }} - installer
206206
path: build/Aegisub-*.dmg
207207
if-no-files-found: error
208208

209209
# Tarball
210210
- name: Generate tarball
211-
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
211+
if: runner.os == 'Linux' && matrix.config.buildtype == 'release'
212212
run: |
213213
set -e
214214
@@ -222,7 +222,7 @@ jobs:
222222
223223
- name: Upload artifacts - tarball
224224
uses: actions/upload-artifact@v4
225-
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
225+
if: runner.os == 'Linux' && matrix.config.buildtype == 'release'
226226
with:
227227
name: Source Tarball
228228
path: build/meson-dist/*.tar.xz

0 commit comments

Comments
 (0)