From b9ab48e4667fb14b1e79c5b729b422df65923533 Mon Sep 17 00:00:00 2001 From: Nathan Ansel Date: Tue, 11 Feb 2025 11:45:48 -0600 Subject: [PATCH] Adds a mas build with the autofill extension --- .github/workflows/build-desktop.yml | 9 ++++++--- apps/desktop/macos/production.xcconfig | 4 ++-- apps/desktop/package.json | 1 + apps/desktop/resources/entitlements.mas.inherit.plist | 2 -- apps/desktop/scripts/build-macos-extension.js | 6 ++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 011cd68ccf7..8628777d85c 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -850,8 +850,9 @@ jobs: cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile + 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 \ - $GITHUB_WORKSPACE/apps/desktop/macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile + $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/${AUTOFILL_UUID}.provisionprofile - name: Increment version shell: pwsh @@ -1106,8 +1107,10 @@ 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 + 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 \ - $GITHUB_WORKSPACE/apps/desktop/macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile + $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile - name: Increment version shell: pwsh @@ -1190,7 +1193,7 @@ jobs: APP_STORE_CONNECT_AUTH_KEY: 6TV9MKN3GP APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_6TV9MKN3GP.p8 CSC_FOR_PULL_REQUEST: true - run: npm run pack:mac:mas + run: npm run pack:mac:mas:with-extension - name: Upload .pkg artifact uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 diff --git a/apps/desktop/macos/production.xcconfig b/apps/desktop/macos/production.xcconfig index f06f2bf736e..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[sdk=macosx*] = 3rd Party Mac Developer Application -PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = 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/package.json b/apps/desktop/package.json index 249145eb3ea..e8d48b4e286 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -39,6 +39,7 @@ "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never", "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never", "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never", + "pack:mac:mas:with-extension": "npm run clean:dist && npm run build:macos-extension && electron-builder --mac mas --universal -p never", "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never", "pack:mac:masdev:with-extension": "npm run clean:dist && npm run build:macos-extension && electron-builder --mac mas-dev --universal -p never", "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"", diff --git a/apps/desktop/resources/entitlements.mas.inherit.plist b/apps/desktop/resources/entitlements.mas.inherit.plist index e9a28f8f327..fca5f02d52d 100644 --- a/apps/desktop/resources/entitlements.mas.inherit.plist +++ b/apps/desktop/resources/entitlements.mas.inherit.plist @@ -8,7 +8,5 @@ com.apple.security.cs.allow-jit - com.apple.developer.authentication-services.autofill-credential-provider - diff --git a/apps/desktop/scripts/build-macos-extension.js b/apps/desktop/scripts/build-macos-extension.js index 6deec85cd1f..b3a3d5e037a 100644 --- a/apps/desktop/scripts/build-macos-extension.js +++ b/apps/desktop/scripts/build-macos-extension.js @@ -30,10 +30,8 @@ async function buildMacOs() { "-configuration", "Release", // Uncomment when signing is fixed - // "-xcconfig", - // paths.macOsConfig, - "PROVISIONING_PROFILE=" + paths.macOsProvisioningProfile, - "CODE_SIGN_IDENTITY=4B9662CAB74E8E4F4ECBDD9EDEF2543659D95E3C", + "-xcconfig", + paths.macOsConfig, ]); stdOutProc(proc); await new Promise((resolve, reject) =>