Skip to content

Commit 68b8fc3

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 047ca90 commit 68b8fc3

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
@@ -167,49 +167,49 @@ jobs:
167167

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

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

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

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

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

210210
# Tarball
211211
- name: Generate tarball
212-
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
212+
if: runner.os == 'Linux' && matrix.config.buildtype == 'release'
213213
run: |
214214
set -e
215215
@@ -223,7 +223,7 @@ jobs:
223223
224224
- name: Upload artifacts - tarball
225225
uses: actions/upload-artifact@v4
226-
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
226+
if: runner.os == 'Linux' && matrix.config.buildtype == 'release'
227227
with:
228228
name: Source Tarball
229229
path: build/meson-dist/*.tar.xz

0 commit comments

Comments
 (0)