From 8a28bf89cb18ad156ca0a0a1e5eb5a52df56fad0 Mon Sep 17 00:00:00 2001 From: Dave Mollen Date: Sun, 4 Aug 2024 11:54:32 +0200 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff9b8b4..d35e137 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,12 +18,8 @@ jobs: strategy: matrix: include: - - { name: ubuntu-20.04, os: ubuntu-20.04, cross-target: "" } - - { - name: macos-universal, - os: macos-11, - cross-target: aarch64-apple-darwin, - } + - { name: ubuntu, os: ubuntu-latest, cross-target: "" } + - { name: macos, os: macos-latest, cross-target: x86_64-apple-darwin } - { name: windows, os: windows-latest, cross-target: "" } name: Package nih-plug binaries runs-on: ${{ matrix.os }} @@ -62,7 +58,7 @@ jobs: # Needed for SIMD uses: dtolnay/rust-toolchain@nightly with: - # The macOS AArch64 build is done from an x86_64 macOS CI runner, so + # The macOS x86_64 build is done from an AArch64 macOS CI runner, so # it needs to be cross compiled targets: ${{ matrix.cross-target }} @@ -70,16 +66,16 @@ jobs: working-directory: ./nih-plug run: | runner_name=${{ matrix.name }} - if [[ $runner_name = 'macos-universal' ]]; then + if [[ $runner_name = 'macos' ]]; then export MACOSX_DEPLOYMENT_TARGET=10.13 cargo xtask bundle-universal $binary_name --release else cross_target=${{ matrix.cross-target }} if [[ -n $cross_target ]]; then cargo xtask bundle $binary_name --release --target $cross_target + else + cargo xtask bundle $binary_name --release fi - - cargo xtask bundle $binary_name --release fi - name: Determine build archive name