From b58f83a44df8e350c00c991c4f1d953b44cf1ade Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Sun, 5 Dec 2021 21:53:36 -0600 Subject: [PATCH] CI: Update macos deps to 2021-12-05 --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91e42f7ac..cded075fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: runs-on: [macos-latest] env: MIN_MACOS_VERSION: '10.13' - MACOS_DEPS_VERSION: '2021-03-25' + MACOS_DEPS_VERSION: '2021-12-05' VLC_VERSION: '3.0.8' SPARKLE_VERSION: '1.23.0' QT_VERSION: '5.15.2' @@ -111,14 +111,15 @@ jobs: if: steps.deps-cache.outputs.cache-hit != 'true' shell: bash run: | - curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-deps-${{ env.CURRENT_ARCH }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz - tar -xf ./macos-deps-${{ env.CURRENT_ARCH }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz -C "/tmp" + mkdir /tmp/obsdeps + curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-deps-${{ env.MACOS_DEPS_VERSION }}-${{ env.CURRENT_ARCH }}.tar.xz + tar -xf ./macos-deps-${{ env.MACOS_DEPS_VERSION }}-${{ env.CURRENT_ARCH }}.tar.xz -C "/tmp/obsdeps" - name: 'Install prerequisite: Pre-built dependency Qt' if: steps.deps-qt-cache.outputs.cache-hit != 'true' shell: bash run: | - curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-qt-${{ env.QT_VERSION }}-${{ env.CURRENT_ARCH }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz - tar -xf ./macos-qt-${{ env.QT_VERSION }}-${{ env.CURRENT_ARCH }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz -C "/tmp" + curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-deps-qt-${{ env.MACOS_DEPS_VERSION }}-${{ env.CURRENT_ARCH }}.tar.xz + tar -xf ./macos-deps-qt-${{ env.MACOS_DEPS_VERSION }}-${{ env.CURRENT_ARCH }}.tar.xz -C "/tmp/obsdeps" xattr -r -d com.apple.quarantine /tmp/obsdeps - name: 'Install prerequisite: VLC' if: steps.vlc-cache.outputs.cache-hit != 'true'