From a89158b5c2b20fba3b6ac7ba9106eebd93b50869 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 20 May 2024 13:49:20 +0200 Subject: [PATCH 1/3] ci: Try to work around yet another gh actions bug --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bc460d52c..5091ed39a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,8 +121,8 @@ jobs: # 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 From 246dbd76706f16e85ad7cfc823020d7764b291f7 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 20 May 2024 14:29:18 +0200 Subject: [PATCH 2/3] ci: Update github actions versions yet again --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5091ed39a0..ec7988f1eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,11 +76,11 @@ jobs: } 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' @@ -200,7 +200,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 }} From 723f18173003166b1474c3e7277fe40a0df9dc55 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 20 May 2024 14:30:00 +0200 Subject: [PATCH 3/3] ci: Pin macos to macos-13 for now macos-latest now runs on Apple Silicon, which fails one test and probably still needs extra work for the packaging to work. Until that's figured out, run on macos-13. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec7988f1eb..64f0560838 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,13 +64,13 @@ jobs: -Dvapoursynth=enabled - { name: macOS Debug, - os: macos-latest, + os: macos-13, buildtype: debugoptimized, args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 } - { name: macOS Release, - os: macos-latest, + os: macos-13, buildtype: release, args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 } @@ -114,7 +114,7 @@ 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