From 4c9f7867a83a3d68e0b7061fdd2ac5584a263148 Mon Sep 17 00:00:00 2001 From: cold-brewed Date: Thu, 5 Oct 2023 13:07:19 -0400 Subject: [PATCH 1/2] GHA workaround for homebrew package issue, enable macOS packaging again --- .github/workflows/cmake.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2e8a6c2fc..8a5392728 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -411,8 +411,15 @@ jobs: slug: -Qt packages: >- qt@5 + src-packages: >- + libsndfile steps: + - name: Install source dependencies + run: >- + brew install -s + ${{ matrix.ui.src-packages }} + - name: Install dependencies run: >- brew install @@ -458,12 +465,10 @@ jobs: sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" - name: Generate package - if: 0 run: | cmake --install build - name: Upload artifact - if: 0 uses: actions/upload-artifact@v3 with: name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' From 149ce8ad2a9f3c82c715b605d526919c85e8c087 Mon Sep 17 00:00:00 2001 From: cold-brewed Date: Thu, 5 Oct 2023 13:40:00 -0400 Subject: [PATCH 2/2] GHA: Perform a reinstall instead --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8a5392728..ae3f96de2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -417,7 +417,7 @@ jobs: steps: - name: Install source dependencies run: >- - brew install -s + brew reinstall -s ${{ matrix.ui.src-packages }} - name: Install dependencies