From a21365f782c542a017659733490ef1e36f4c430c Mon Sep 17 00:00:00 2001 From: Nathan Ansel Date: Wed, 12 Feb 2025 14:40:03 -0600 Subject: [PATCH] Passes in identity and provisioning profile in after sign call --- .github/workflows/build-desktop.yml | 26 +++++++++++++------------- apps/desktop/macos/production.xcconfig | 4 ++-- apps/desktop/scripts/after-sign.js | 5 ++++- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index e0666f1b6d0..c35793e46df 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -654,12 +654,12 @@ jobs: cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles + export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_appstore.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` - cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile @@ -856,12 +856,12 @@ jobs: cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles + export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_appstore.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` - cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile @@ -1114,16 +1114,16 @@ jobs: security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain - name: Set up provisioning profiles - run: | + run: | cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles + export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_appstore.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` - cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile @@ -1388,12 +1388,12 @@ jobs: cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles + export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_appstore.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile | grep -io "[-A-Z0-9]\{36\}"` - cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile diff --git a/apps/desktop/macos/production.xcconfig b/apps/desktop/macos/production.xcconfig index fb8e39e82b7..98b9d4335ea 100644 --- a/apps/desktop/macos/production.xcconfig +++ b/apps/desktop/macos/production.xcconfig @@ -7,5 +7,5 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -CODE_SIGN_IDENTITY=3rd Party Mac Developer Application -PROVISIONING_PROFILE_SPECIFIER=Bitwarden Desktop Autofill App Store 2024 +CODE_SIGN_IDENTITY = 3rd Party Mac Developer Application +PROVISIONING_PROFILE_SPECIFIER = Bitwarden Desktop Autofill App Store 2024 diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js index 20c24c8a76b..427425f9b8f 100644 --- a/apps/desktop/scripts/after-sign.js +++ b/apps/desktop/scripts/after-sign.js @@ -57,7 +57,10 @@ async function run(context) { // Resign to sign safari extension if (context.electronPlatformName === "mas") { const masBuildOptions = deepAssign( - {}, + { + identity: "Bitwarden Inc (LTZ2PFU5D6)", + provisioningProfile: "./bitwarden_desktop_appstore.provisionprofile", + }, context.packager.platformSpecificBuildOptions, context.packager.config.mas, );