aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix MAS build (#2978)

Browse source
This commit is contained in:
Devin Binnie 2024-03-12 10:33:11 -04:00 committed by GitHub
parent e56b5cdd6a
commit 22860a4566
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/nightly-main.yml vendored
View file

@ -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

5
.github/workflows/release-mas.yaml vendored
View file

@ -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

3
electron-builder.json
View file

@ -111,8 +111,7 @@
},
"notarize": {
"teamId": "UQ8HT4Q2XM"
},
"provisioningProfile": "./mac.provisionprofile"
}
},
"mas": {
"hardenedRuntime": false,

2
package.json
View file

@ -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",