phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix mac build again 😭 (#3281)

Browse Source 
* Fix mac build again

* Missed one
This commit is contained in:
Devin Binnie
2025-01-10 12:42:43 -05:00
committed by GitHub
parent f64e9ab048
commit b6bbfea695
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-for-pr.yml vendored
View File

@@ -162,14 +162,17 @@ jobs:
npm ci npm ci
- name: ci/build - name: ci/build
env: env:
APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} APPLE_API_KEY_RAW: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY }}
APPLE_API_KEY: "./key.p8"
APPLE_API_ISSUER: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_ISSUER_ID }}
CSC_FOR_PULL_REQUEST: true CSC_FOR_PULL_REQUEST: true
CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }}
MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }}
run: | run: |
echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile
zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8'
mkdir -p ./build/macos mkdir -p ./build/macos
npm run package:mac npm run package:mac
bash -x ./scripts/patch_updater_yml.sh bash -x ./scripts/patch_updater_yml.sh

7
.github/workflows/nightly-main.yml vendored
View File

@@ -166,14 +166,17 @@ jobs:
uses: ./.github/actions/test uses: ./.github/actions/test
- name: nightly/build - name: nightly/build
env: env:
APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} APPLE_API_KEY_RAW: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY }}
APPLE_API_KEY: "./key.p8"
APPLE_API_ISSUER: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_ISSUER_ID }}
CSC_FOR_PULL_REQUEST: true CSC_FOR_PULL_REQUEST: true
CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }}
MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }}
run: | run: |
echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile
zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8'
mkdir -p ./build/macos-release mkdir -p ./build/macos-release
npm run package:mac-with-universal npm run package:mac-with-universal
bash -x ./scripts/patch_updater_yml.sh bash -x ./scripts/patch_updater_yml.sh

7
.github/workflows/nightly-rainforest.yml vendored
View File

@@ -94,14 +94,17 @@ jobs:
uses: ./.github/actions/test uses: ./.github/actions/test
- name: nightly/build - name: nightly/build
env: env:
APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} APPLE_API_KEY_RAW: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY }}
APPLE_API_KEY: "./key.p8"
APPLE_API_ISSUER: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_ISSUER_ID }}
CSC_FOR_PULL_REQUEST: true CSC_FOR_PULL_REQUEST: true
CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }}
MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }}
run: | run: |
echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile
zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8'
mkdir -p ./build/macos mkdir -p ./build/macos
npm run package:mac-with-universal npm run package:mac-with-universal
bash -x ./scripts/patch_updater_yml.sh bash -x ./scripts/patch_updater_yml.sh

7
.github/workflows/release.yaml vendored
View File

@@ -142,14 +142,17 @@ jobs:
uses: ./.github/actions/test uses: ./.github/actions/test
- name: release/build - name: release/build
env: env:
APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} APPLE_API_KEY_RAW: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY }}
APPLE_API_KEY: "./key.p8"
APPLE_API_ISSUER: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_ISSUER_ID }}
CSC_FOR_PULL_REQUEST: true CSC_FOR_PULL_REQUEST: true
CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }}
MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }}
run: | run: |
echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile
zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8'
mkdir -p ./build/macos-release mkdir -p ./build/macos-release
npm run package:mac-with-universal npm run package:mac-with-universal
bash -x ./scripts/patch_updater_yml.sh bash -x ./scripts/patch_updater_yml.sh

4
.gitignore vendored
View File

@@ -26,4 +26,6 @@ fastlane/report.xml
*.provisionprofile *.provisionprofile
*.tsbuildinfo *.tsbuildinfo
.eslintcache .eslintcache
*.p8

3
electron-builder.json
View File

@@ -109,9 +109,6 @@
"NSCameraUsageDescription": "Camera access may be used by Mattermost plugins, such as Jitsi video conferencing.", "NSCameraUsageDescription": "Camera access may be used by Mattermost plugins, such as Jitsi video conferencing.",
"NSFocusStatusUsageDescription": "Focus status is used by Mattermost to determine whether to send notifications or not.", "NSFocusStatusUsageDescription": "Focus status is used by Mattermost to determine whether to send notifications or not.",
"LSFileQuarantineEnabled": true "LSFileQuarantineEnabled": true
},
"notarize": {
"teamId": "UQ8HT4Q2XM"
} }
}, },
"mas": { "mas": {