diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a1a4c3d..977c577c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,13 +52,23 @@ jobs: - uses: actions/checkout@v1 with: submodules: recursive - - name: Build - run: scripts/create-dmg.sh -DTEV_DEPLOY=1 -DTEV_SUPPORT_HEIC=${{ env.SUPPORT_HEIC }} - - name: Upload .dmg + - name: Build x86_64 + run: scripts/create-dmg.sh -DTEV_DEPLOY=1 -DTEV_SUPPORT_HEIC=${{ env.SUPPORT_HEIC }} -DCMAKE_OSX_ARCHITECTURES="x86_64" + - name: Rename x86_64 .dmg + run: mv tev.dmg tev-intel.dmg + - name: Build arm64 + run: scripts/create-dmg.sh -DTEV_DEPLOY=1 -DTEV_SUPPORT_HEIC=${{ env.SUPPORT_HEIC }} -DCMAKE_OSX_ARCHITECTURES="arm64" + - name: Upload x86_64 .dmg + if: github.event_name != 'pull_request' + uses: actions/upload-artifact@v4 + with: + name: macOS installer (Intel) + path: tev-intel.dmg + - name: Upload arm64 .dmg if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: - name: macOS installer + name: macOS installer (M-series) path: tev.dmg build_windows: diff --git a/scripts/create-dmg.sh b/scripts/create-dmg.sh index 486d1fb5..41b6cd15 100755 --- a/scripts/create-dmg.sh +++ b/scripts/create-dmg.sh @@ -12,7 +12,6 @@ MACOSX_DEPLOYMENT_TARGET=10.15 cmake \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ "$@" \ ../.. || exit 1 make -j || exit 1