diff --git a/.github/workflows/nightly-main.yml b/.github/workflows/nightly-main.yml index 8775ef36..87e71d93 100644 --- a/.github/workflows/nightly-main.yml +++ b/.github/workflows/nightly-main.yml @@ -111,7 +111,6 @@ jobs: mac-app-store-preflight: runs-on: macos-12 env: - MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} MAS_PROFILE: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MAS_PROFILE }} MACOS_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }} MACOS_API_KEY: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY }} @@ -135,9 +134,7 @@ jobs: brew install yq npm ci - name: nightly/copy-provisioning-profile - run: | - echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile - echo $MAS_PROFILE | base64 -D > ./mas.provisionprofile + run: echo $MAS_PROFILE | base64 -D > ./mas.provisionprofile - name: nightly/patch-version-number-for-MAS run: ./scripts/patch_mas_version.sh - name: nightly/test diff --git a/.github/workflows/release-mas.yaml b/.github/workflows/release-mas.yaml index 1d6f8f6f..e7ecde8d 100644 --- a/.github/workflows/release-mas.yaml +++ b/.github/workflows/release-mas.yaml @@ -17,7 +17,6 @@ jobs: mac-app-store-preflight: runs-on: macos-12 env: - MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} MAS_PROFILE: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MAS_PROFILE }} MACOS_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }} MACOS_API_KEY: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY }} @@ -39,9 +38,7 @@ jobs: brew install yq npm ci - name: release/copy-provisioning-profile - run: | - echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile - echo $MAS_PROFILE | base64 -D > ./mas.provisionprofile + run: echo $MAS_PROFILE | base64 -D > ./mas.provisionprofile - name: release/patch-version-number-for-MAS run: ./scripts/patch_mas_version.sh - name: release/test diff --git a/electron-builder.json b/electron-builder.json index becd227d..a8f80994 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -111,8 +111,7 @@ }, "notarize": { "teamId": "UQ8HT4Q2XM" - }, - "provisioningProfile": "./mac.provisionprofile" + } }, "mas": { "hardenedRuntime": false, diff --git a/package.json b/package.json index ff779dd2..796a39d2 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "package": "run-s package:windows package:windows-nsis package:mac-with-universal package:mas package:linux", "package:windows": "npm run build-prod && electron-builder --win zip --x64 --ia32 --arm64 --publish=never", "package:windows-nsis": "npm run build-prod-upgrade && electron-builder --win zip nsis --x64 --ia32 --arm64 --publish=never", - "package:mac": "npm run build-prod && electron-builder --mac --x64 --arm64 --publish=never", + "package:mac": "npm run build-prod && electron-builder --config.mac.provisioningProfile=./mac.provisionProfile --mac --x64 --arm64 --publish=never", "package:mac-with-universal": "npm run package:mac -- --universal", "package:mas": "npm run build-prod-mas && electron-builder --mac mas --universal --publish=never", "package:mas-dev": "npm run build-prod-mas && electron-builder --mac mas-dev --universal --publish=never",