From 3f3acd2fce6767912f3528b9e772b1f0984f2b3c Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Thu, 18 Apr 2024 10:54:59 -0500 Subject: [PATCH] Updated workflow --- .github/workflows/package_release.yml | 18 +++++++++++++++--- package.json | 3 ++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package_release.yml b/.github/workflows/package_release.yml index 86d289c..ab2db37 100644 --- a/.github/workflows/package_release.yml +++ b/.github/workflows/package_release.yml @@ -70,8 +70,8 @@ jobs: - name: Install Dependencies run: npm install # Build the project - - name: Package for MacOS - run: npm run electron:package:mac + - name: Package for MacOS (x64) + run: npm run electron:package:mac:x64 env: GH_TOKEN: ${{secrets.GITHUB_TOKEN}} # Rename the release artifact @@ -79,10 +79,22 @@ jobs: run: mv dist/FrameCast-*.dmg dist/FrameCast.Setup.darwin_x64.dmg - name: Rename Artifact Blockmap run: mv dist/FrameCast-*.dmg.blockmap dist/FrameCast.Setup.darwin_x64.dmg.blockmap + # Build the project + - name: Package for MacOS (arm64) + run: npm run electron:package:mac:arm64 + env: + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} + # Rename the release artifact + - name: Rename Artifact + run: mv dist/FrameCast-*.dmg dist/FrameCast.Setup.darwin_arm64.dmg + - name: Rename Artifact Blockmap + run: mv dist/FrameCast-*.dmg.blockmap dist/FrameCast.Setup.darwin_arm64.dmg.blockmap # Upload the release artifact - name: Upload Artifacts uses: softprops/action-gh-release@v2 with: files: | dist/FrameCast.Setup.darwin_x64.dmg - dist/FrameCast.Setup.darwin_x64.dmg.blockmap \ No newline at end of file + dist/FrameCast.Setup.darwin_x64.dmg.blockmap + dist/FrameCast.Setup.darwin_arm64.dmg + dist/FrameCast.Setup.darwin_arm64.dmg.blockmap \ No newline at end of file diff --git a/package.json b/package.json index 3c968f7..aad9f70 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ "test": "react-scripts test", "eject": "react-scripts eject", "electron:start": "concurrently -k \"cross-env BROWSER=none npm run start\" \"wait-on http://127.0.0.1:3000 && electronmon .\"", - "electron:package:mac": "npm run build && electron-builder -m -c.extraMetadata.main=build/electron.js", + "electron:package:mac:x64": "npm run build && electron-builder -m --x64 -c.extraMetadata.main=build/electron.js", + "electron:package:mac:arm64": "npm run build && electron-builder -m --arm64 -c.extraMetadata.main=build/electron.js", "electron:package:win": "npm run build && electron-builder -w -c.extraMetadata.main=build/electron.js", "electron:package:linux": "npm run build && electron-builder -l -c.extraMetadata.main=build/electron.js" },