Merge branch 'macos-signing-fix' of https://github.com/zen-browser/desktop into macos-signing-fix

.github/workflows/macos-release-build.yml

@@ -142,6 +142,7 @@ jobs:
           set -ex
           mv ./dist/*.dmg ./zen-${{ matrix.arch }}-apple-darwin-dist.dmg
           mv ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/host/bin/mar ./zen-macos-host-mar
+          mv ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/bin/platform.ini ./platform.ini
 
       - name: Upload dist dmg
         uses: actions/upload-artifact@v4
@@ -158,3 +159,10 @@ jobs:
           name: zen-macos-host-mar
           path: ./zen-macos-host-mar
 
+      - name: Upload platform.ini
+        uses: actions/upload-artifact@v4
+        if: matrix.arch == 'x86_64'
+        with:
+          retention-days: 1
+          name: platform.ini
+          path: ./platform.ini

.github/workflows/macos-universal-release-build.yml

@@ -169,13 +169,6 @@ jobs:
           echo "${{ secrets.macOS_PROVISIONING_PROFILE }}" | base64 --decode > ./engine/Zen_Browser.provisionprofile
           ls -la
 
-      - name: Copy provisioning profile for .app on both architectures (embedded in .app)
-        run: |
-          cd engine
-          echo "Copying provisioning profile for .app on both architectures (${{ env.APP_NAME }})"
-          cp ./Zen_Browser.provisionprofile "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app/Contents/embedded.provisionprofile"
-          cp ./Zen_Browser.provisionprofile "./obj-aarch64-apple-darwin/dist/${{ env.APP_NAME }}.app/Contents/embedded.provisionprofile"
-
       - name: Unify architectures
         run: |
           cd engine
@@ -194,9 +187,11 @@ jobs:
           # TODO: Change it to "production" once we figure out the issue with the webauth
           ./mach macos-sign -v -r -c "release" -e "production" -a "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app" --rcodesign-p12-file zenCert.p12 --rcodesign-p12-password-file zenpCertPassword.passwd
 
-      - name: Remove sensitive information
+      - name: Copy provisioning profile for .app (embedded in .app)
         run: |
-          rm -f ./engine/Zen_Browser.provisionprofile
+          cd engine
+          echo "Copying provisioning profile for .app on both architectures (${{ env.APP_NAME }})"
+          cp ./Zen_Browser.provisionprofile "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app/Contents/embedded.provisionprofile"
 
       - name: Create DMG
         run: |
@@ -208,6 +203,10 @@ jobs:
             --dsstore ./browser/branding/${{ inputs.release-branch }}/dsstore \
             ./obj-x86_64-apple-darwin/dist/ ../zen-macOS-universal-temp.dmg
 
+      - name: Remove sensitive information
+        run: |
+          rm -f ./engine/Zen_Browser.provisionprofile
+
       - name: Sign .dmg
         run: |
           set -ex
@@ -233,6 +232,11 @@ jobs:
           name: zen.macos-universal.dmg
           path: ./zen.macos-universal.dmg
 
+      - name: Download platform.ini
+        uses: actions/download-artifact@v4
+        with:
+          name: platform.ini
+
       - name: Package for mar
         env:
           JUST_MAR: true
@@ -240,6 +244,8 @@ jobs:
           # we don't need it anymore
           set -ex
           rm -rf ./engine/obj-aarch64-apple-darwin
+          mkdir -p ./engine/obj-x86_64-apple-darwin/dist/bin
+          mv ./platform.ini ./engine/obj-x86_64-apple-darwin/dist/bin/platform.ini
           export SURFER_PLATFORM="darwin"
           export ZEN_RELEASE=1
           # full path to zen-macos-host-mar