Skip to content

Commit 0e44a34

Browse files
committed
Merge branch 'bugfixes' into feature
2 parents 628f130 + d1916fc commit 0e44a34

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ jobs:
9999
-Dvapoursynth=enabled
100100
- {
101101
name: macOS Release,
102-
os: macos-latest,
102+
os: macos-13,
103103
buildtype: release,
104104
args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true -Dvapoursynth=enabled --force-fallback-for=ffms2
105105
}
106106

107107
steps:
108-
- uses: actions/checkout@v3
108+
- uses: actions/checkout@v4
109109
with:
110110
fetch-depth: '0'
111111

112-
- uses: actions/setup-python@v4
112+
- uses: actions/setup-python@v5
113113
with:
114114
python-version: '3.x'
115115

@@ -143,15 +143,15 @@ jobs:
143143
popd
144144
145145
- name: Install dependencies (MacOS)
146-
if: matrix.config.os == 'macos-latest'
146+
if: startsWith(matrix.config.os, 'macos-')
147147
run: |
148148
export HOMEBREW_NO_INSTALL_CLEANUP=1
149149
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
150150
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
151151
# brew update
152152
brew install luarocks ninja
153-
luarocks install luafilesystem 1.8.0
154-
luarocks install moonscript --dev
153+
sudo luarocks install luafilesystem 1.8.0
154+
sudo luarocks install moonscript --dev
155155
brew install libass zlib ffms2 fftw hunspell
156156
brew install pulseaudio # NO OpenAL in github CI
157157
@@ -201,14 +201,14 @@ jobs:
201201

202202
# macOS artifacts
203203
- name: Generate macOS installer
204-
if: matrix.config.os == 'macos-latest'
204+
if: startsWith(matrix.config.os, 'macos-')
205205
run: |
206206
meson compile osx-bundle -C build
207207
meson compile osx-build-dmg -C build
208208
209209
- name: Upload artifacts - macOS dmg
210210
uses: actions/upload-artifact@v3
211-
if: matrix.config.os == 'macos-latest'
211+
if: startsWith(matrix.config.os, 'macos-')
212212
with:
213213
name: ${{ matrix.config.name }} - installer
214214
path: build/Aegisub-*.dmg
@@ -231,7 +231,7 @@ jobs:
231231
./appimagetool appdir
232232
233233
- name: Upload artifacts - Linux AppImage
234-
uses: actions/upload-artifact@v3
234+
uses: actions/upload-artifact@v4
235235
if: matrix.config.appimage
236236
with:
237237
name: ${{ matrix.config.name }}

0 commit comments

Comments
 (0)