Merge branch 'bugfixes' into feature

arch1t3cht · May 21, 2024 · 0e44a34 · 0e44a34
2 parents 628f130 + d1916fc
commit 0e44a34
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -99,17 +99,17 @@ jobs:
               -Dvapoursynth=enabled
           - {
             name: macOS Release,
-            os: macos-latest,
+            os: macos-13,
             buildtype: release,
             args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true -Dvapoursynth=enabled --force-fallback-for=ffms2
           }
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -143,15 +143,15 @@ jobs:
           popd
 
       - name: Install dependencies (MacOS)
-        if: matrix.config.os == 'macos-latest'
+        if: startsWith(matrix.config.os, 'macos-')
         run: |
           export HOMEBREW_NO_INSTALL_CLEANUP=1
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
           # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
           # brew update
           brew install luarocks ninja
-          luarocks install luafilesystem 1.8.0
-          luarocks install moonscript --dev
+          sudo luarocks install luafilesystem 1.8.0
+          sudo luarocks install moonscript --dev
           brew install libass zlib ffms2 fftw hunspell
           brew install pulseaudio  # NO OpenAL in github CI
 
@@ -201,14 +201,14 @@ jobs:
 
       # macOS artifacts
       - name: Generate macOS installer
-        if: matrix.config.os == 'macos-latest'
+        if: startsWith(matrix.config.os, 'macos-')
         run: |
           meson compile osx-bundle -C build
           meson compile osx-build-dmg -C build
 
       - name: Upload artifacts - macOS dmg
         uses: actions/upload-artifact@v3
-        if: matrix.config.os == 'macos-latest'
+        if: startsWith(matrix.config.os, 'macos-')
         with:
           name: ${{ matrix.config.name }} - installer
           path: build/Aegisub-*.dmg
@@ -231,7 +231,7 @@ jobs:
           ./appimagetool appdir
 
       - name: Upload artifacts - Linux AppImage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.config.appimage
         with:
           name: ${{ matrix.config.name }}