From 7f99691e928da51d0c7f29e889146adab41bc524 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 29 Jan 2025 10:47:31 +0100 Subject: [PATCH 1/2] Uploading platform.init --- .github/workflows/macos-release-build.yml | 8 ++++++++ .github/workflows/macos-universal-release-build.yml | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 18035c75b..2c6a43445 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.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 diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml index f32824ae4..eec9dbe8b 100644 --- a/.github/workflows/macos-universal-release-build.yml +++ b/.github/workflows/macos-universal-release-build.yml @@ -173,8 +173,8 @@ jobs: 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" + # 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: | @@ -192,7 +192,7 @@ jobs: run: | cd engine # 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 + ./mach macos-sign -v -r -c "release" -e "production-without-restricted" -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 run: | @@ -233,6 +233,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 +245,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 From a3e1033c1124fca128a4fa68257dfaa8a5ec73e9 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 29 Jan 2025 14:52:15 +0100 Subject: [PATCH 2/2] Fixed macos signing --- .../macos-universal-release-build.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml index eec9dbe8b..144027a5c 100644 --- a/.github/workflows/macos-universal-release-build.yml +++ b/.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 @@ -192,11 +185,13 @@ jobs: run: | cd engine # TODO: Change it to "production" once we figure out the issue with the webauth - ./mach macos-sign -v -r -c "release" -e "production-without-restricted" -a "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app" --rcodesign-p12-file zenCert.p12 --rcodesign-p12-password-file zenpCertPassword.passwd + ./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