From e212e5711364bb74364c76132913c7a1f918cdd1 Mon Sep 17 00:00:00 2001 From: Devin Binnie Date: Fri, 10 Jan 2025 12:22:24 -0500 Subject: [PATCH] Fix mac build again --- .github/workflows/build-for-pr.yml | 7 +++++-- .github/workflows/nightly-main.yml | 8 +++++--- .github/workflows/nightly-rainforest.yml | 7 +++++-- .github/workflows/release.yaml | 7 +++++-- .gitignore | 4 +++- electron-builder.json | 3 --- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-for-pr.yml b/.github/workflows/build-for-pr.yml index 297645b7390..44b14297976 100644 --- a/.github/workflows/build-for-pr.yml +++ b/.github/workflows/build-for-pr.yml @@ -162,14 +162,17 @@ jobs: npm ci - name: ci/build env: - APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} + APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }} + 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_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} run: | echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile + zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8' mkdir -p ./build/macos npm run package:mac bash -x ./scripts/patch_updater_yml.sh diff --git a/.github/workflows/nightly-main.yml b/.github/workflows/nightly-main.yml index c776b8ee12a..91505160f47 100644 --- a/.github/workflows/nightly-main.yml +++ b/.github/workflows/nightly-main.yml @@ -166,15 +166,17 @@ jobs: uses: ./.github/actions/test - name: nightly/build env: - APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} + APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }} + 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_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} run: | echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile - mkdir -p ./build/macos-release + zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8' npm run package:mac-with-universal bash -x ./scripts/patch_updater_yml.sh bash -x ./scripts/cp_artifacts.sh release ./build/macos-release diff --git a/.github/workflows/nightly-rainforest.yml b/.github/workflows/nightly-rainforest.yml index d9908c9189e..8bd0e256662 100644 --- a/.github/workflows/nightly-rainforest.yml +++ b/.github/workflows/nightly-rainforest.yml @@ -94,14 +94,17 @@ jobs: uses: ./.github/actions/test - name: nightly/build env: - APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} + APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }} + 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_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} run: | echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile + zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8' mkdir -p ./build/macos npm run package:mac-with-universal bash -x ./scripts/patch_updater_yml.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0f7a92af335..b0d3cc60598 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -142,14 +142,17 @@ jobs: uses: ./.github/actions/test - name: release/build env: - APPLE_ID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID_PASS }} + APPLE_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }} + 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_KEY_PASSWORD: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_KEY_PASSWORD }} CSC_LINK: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_CSC_LINK }} MAC_PROFILE: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_DMG_PROFILE }} run: | echo $MAC_PROFILE | base64 -D > ./mac.provisionprofile + zsh -c 'echo -n $APPLE_API_KEY_RAW > ./key.p8' mkdir -p ./build/macos-release npm run package:mac-with-universal bash -x ./scripts/patch_updater_yml.sh diff --git a/.gitignore b/.gitignore index e06bdfad872..30e1cecc568 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,6 @@ fastlane/report.xml *.provisionprofile *.tsbuildinfo -.eslintcache \ No newline at end of file +.eslintcache + +*.p8 \ No newline at end of file diff --git a/electron-builder.json b/electron-builder.json index 078ae8874a7..d29e75dbfe5 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -109,9 +109,6 @@ "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.", "LSFileQuarantineEnabled": true - }, - "notarize": { - "teamId": "UQ8HT4Q2XM" } }, "mas": {