diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c395dbc..ba1e33c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,23 +157,11 @@ jobs: *.tar.xz macos: - strategy: - matrix: - debug: [0, 1] - target: [universal-10.15] - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: submodules: recursive - - name: Set debug or release - shell: bash - run: | - if [ "${{ matrix.debug }}" -eq 1 ]; then - echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV - echo "MAKE_ARGS='DEBUG=true jack au'" >> $GITHUB_ENV - echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV - fi - name: Set up cache id: cache uses: actions/cache@v4 @@ -188,32 +176,32 @@ jobs: src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libsamplerate-0.1.9 src/Rack/dep/zstd-1.4.5 - key: macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-v${{ env.CACHE_VERSION }} + key: macos-universal-v${{ env.CACHE_VERSION }} - name: Setup dependencies run: | - ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-${{ matrix.target }} + ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15 - name: Build extra dependencies run: | export PATH="/usr/local/opt/ccache/libexec:${PATH}" - ./deps/PawPaw/bootstrap-cardinal.sh macos-${{ matrix.target }} && ./deps/PawPaw/.cleanup.sh macos-${{ matrix.target }} + ./deps/PawPaw/bootstrap-cardinal.sh macos-universal-10.15 && ./deps/PawPaw/.cleanup.sh macos-universal-10.15 - name: Set up ccache if: steps.cache.outputs.cache-hit == 'true' uses: hendrikmuhs/ccache-action@v1.2 with: - key: ccache-macos-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-v${{ env.CACHE_VERSION }} + key: ccache-macos-universal-v${{ env.CACHE_VERSION }} - name: Build macOS (base) if: steps.cache.outputs.cache-hit == 'true' shell: bash run: | export PATH="/usr/local/opt/ccache/libexec:${PATH}" - source deps/PawPaw/local.env macos-${{ matrix.target }} + source deps/PawPaw/local.env macos-universal-10.15 make features make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu) - name: Build macOS (packaging) if: steps.cache.outputs.cache-hit == 'true' shell: bash run: | - source deps/PawPaw/local.env macos-${{ matrix.target }} + source deps/PawPaw/local.env macos-universal-10.15 ./utils/create-macos-installer.sh - name: Set sha8 (non-release) if: startsWith(github.ref, 'refs/tags/') != true @@ -224,10 +212,10 @@ jobs: - name: Rename macOS bundle if: steps.cache.outputs.cache-hit == 'true' run: | - mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-${{ github.event.pull_request.number || env.SHA8 }}.pkg + mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || env.SHA8 }}.pkg - uses: actions/upload-artifact@v4 with: - name: ${{ github.event.repository.name }}-macOS-${{ matrix.target }}${{ env.TARGET_SUFFIX }}-${{ github.event.pull_request.number || env.SHA8 }} + name: ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || env.SHA8 }} path: | ${{ github.event.repository.name }}-*.pkg - uses: softprops/action-gh-release@v1