diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 123d3c1b3b7..011cd68ccf7 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -651,13 +651,11 @@ jobs: - name: Set up provisioning profiles run: | - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles - cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/bitwarden_desktop_autofill_app_store_2024.provisionprofile + $GITHUB_WORKSPACE/apps/desktop/macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile - name: Increment version shell: pwsh @@ -849,13 +847,11 @@ jobs: - name: Set up provisioning profiles run: | - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles - cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/bitwarden_desktop_autofill_app_store_2024.provisionprofile + $GITHUB_WORKSPACE/apps/desktop/macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile - name: Increment version shell: pwsh @@ -1106,14 +1102,12 @@ jobs: security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain - name: Set up provisioning profiles - run: | - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles - + run: | cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/bitwarden_desktop_autofill_app_store_2024.provisionprofile + $GITHUB_WORKSPACE/apps/desktop/macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile - name: Increment version shell: pwsh @@ -1373,13 +1367,11 @@ jobs: - name: Set up provisioning profiles run: | - mkdir -p $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles - cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \ - $HOME/Library/Developer/Xcode/UserData/Provisioning\ Profiles/bitwarden_desktop_autofill_app_store_2024.provisionprofile + $GITHUB_WORKSPACE/apps/desktop/macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile - name: Increment version shell: pwsh diff --git a/apps/desktop/scripts/build-macos-extension.js b/apps/desktop/scripts/build-macos-extension.js index 7fea376ff3e..6deec85cd1f 100644 --- a/apps/desktop/scripts/build-macos-extension.js +++ b/apps/desktop/scripts/build-macos-extension.js @@ -11,6 +11,7 @@ const paths = { extensionDist: "./macos/dist/autofill-extension.appex", macOsProject: "./macos/desktop.xcodeproj", macOsConfig: "./macos/production.xcconfig", + macOsProvisioningProfile: "./macos/bitwarden_desktop_autofill_app_store_2024.provisionprofile", }; async function buildMacOs() { @@ -31,7 +32,7 @@ async function buildMacOs() { // Uncomment when signing is fixed // "-xcconfig", // paths.macOsConfig, - "PROVISIONING_PROFILE=$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile", + "PROVISIONING_PROFILE=" + paths.macOsProvisioningProfile, "CODE_SIGN_IDENTITY=4B9662CAB74E8E4F4ECBDD9EDEF2543659D95E3C", ]); stdOutProc(proc);