diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 567ffb7..e455d2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -454,6 +454,8 @@ jobs: pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/ - name: Build macOS intel (packaging) + env: + MACOS_ARCHS: 'x86_64' run: | pushd deps/PawPaw; source local.env macos; popd ./utils/create-macos-installer.sh @@ -542,6 +544,8 @@ jobs: pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/ - name: Build macOS universal (packaging) + env: + MACOS_ARCHS: 'arm64,x86_64' run: | pushd deps/PawPaw; source local.env macos-universal; popd ./utils/create-macos-installer.sh diff --git a/utils/create-macos-installer.sh b/utils/create-macos-installer.sh index 4ab84dd..4530f9d 100755 --- a/utils/create-macos-installer.sh +++ b/utils/create-macos-installer.sh @@ -57,7 +57,9 @@ pkgbuild \ cd .. -sed -e "s|@builddir@|${PWD}/build|" utils/macOS/package.xml.in > build/package.xml +sed -e "s|@builddir@|${PWD}/build|" \ + -e "s|@buildarchs@|${MACOS_ARCHS}|" \ + utils/macOS/package.xml.in > build/package.xml productbuild \ --distribution build/package.xml \ diff --git a/utils/macOS/package.xml.in b/utils/macOS/package.xml.in index b2c8d9c..ccd08bc 100644 --- a/utils/macOS/package.xml.in +++ b/utils/macOS/package.xml.in @@ -3,7 +3,7 @@ Cardinal - +