Skip to content

Commit 9235c03

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 9c80a70 commit 9235c03

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
@@ -136,7 +136,7 @@ jobs:
136136
brew install pulseaudio # NO OpenAL in github CI
137137
138138
- name: Install dependencies (Linux)
139-
if: startsWith(matrix.config.os, 'ubuntu-')
139+
if: runner.os == 'Linux'
140140
run: |
141141
sudo apt-get update
142142
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
@@ -164,49 +164,49 @@ jobs:
164164

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

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

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

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

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

207207
# Tarball
208208
- name: Generate tarball
209-
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
209+
if: runner.os == 'Linux' && matrix.config.buildtype == 'release'
210210
run: |
211211
set -e
212212
@@ -220,7 +220,7 @@ jobs:
220220
221221
- name: Upload artifacts - tarball
222222
uses: actions/upload-artifact@v4
223-
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
223+
if: runner.os == 'Linux' && matrix.config.buildtype == 'release'
224224
with:
225225
name: Source Tarball
226226
path: build/meson-dist/*.tar.xz

0 commit comments

Comments
 (0)