From eb3b07dfcec6b151d174cf05d2cef9f5cfa98763 Mon Sep 17 00:00:00 2001 From: Nathan Ansel Date: Thu, 1 May 2025 08:14:06 -0500 Subject: [PATCH] Enables the autofill extension in mac and mas builds (#14373) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Enables autofill extension building * Try use macos-14 * add --break-system-packages for macos14 * revert using build-native * try add rustup target add x86_64-apple-darwin * add more rustup target add x86_64-apple-darwin * try to force sdk version * Show SDK versions * USE KVC for excludedCredentials * added xcodebuild deugging * Revert "try to force sdk version" This reverts commit d94f2550adf69d944b49273221dbcdcf1a53e416. * Use macos-15 * undo merge * remove macos-15 from cli * remove macos-15 from browser --------- Co-authored-by: Anders Åberg --- .github/workflows/build-desktop.yml | 33 ++++++++++++++-------- .github/workflows/release-desktop-beta.yml | 10 ++++--- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 86dc74f7351..6d954ca1098 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -655,7 +655,7 @@ jobs: macos-build: name: MacOS Build - runs-on: macos-13 + runs-on: macos-15 needs: - setup env: @@ -679,11 +679,13 @@ jobs: node-version: ${{ env._NODE_VERSION }} - name: Set up Node-gyp - run: python3 -m pip install setuptools + run: python3 -m pip install setuptools --break-system-packages - name: Rust shell: pwsh - run: rustup target install aarch64-apple-darwin + run: | + rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin - name: Print environment run: | @@ -692,6 +694,7 @@ jobs: rustup show echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" + xcodebuild -showsdks - name: Cache Build id: build-cache @@ -861,7 +864,7 @@ jobs: macos-package-github: name: MacOS Package GitHub Release Assets - runs-on: macos-13 + runs-on: macos-15 if: ${{ needs.setup.outputs.has_secrets == 'true' }} needs: - browser-build @@ -888,11 +891,13 @@ jobs: node-version: ${{ env._NODE_VERSION }} - name: Set up Node-gyp - run: python3 -m pip install setuptools + run: python3 -m pip install setuptools --break-system-packages - name: Rust shell: pwsh - run: rustup target install aarch64-apple-darwin + run: | + rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin - name: Print environment run: | @@ -901,6 +906,7 @@ jobs: rustup show echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" + xcodebuild -showsdks - name: Get Build Cache id: build-cache @@ -1042,6 +1048,7 @@ jobs: working-directory: apps/desktop/desktop_native run: | rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin node build.js cross-platform - name: Build @@ -1077,7 +1084,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 + run: npm run pack:mac:with-extension - name: Upload .zip artifact uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 @@ -1110,7 +1117,7 @@ jobs: macos-package-mas: name: MacOS Package Prod Release Asset - runs-on: macos-13 + runs-on: macos-15 if: ${{ needs.setup.outputs.has_secrets == 'true' }} needs: - browser-build @@ -1137,11 +1144,13 @@ jobs: node-version: ${{ env._NODE_VERSION }} - name: Set up Node-gyp - run: python3 -m pip install setuptools + run: python3 -m pip install setuptools --break-system-packages - name: Rust shell: pwsh - run: rustup target install aarch64-apple-darwin + run: | + rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin - name: Print environment run: | @@ -1150,6 +1159,7 @@ jobs: rustup show echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" + xcodebuild -showsdks - name: Get Build Cache id: build-cache @@ -1298,6 +1308,7 @@ jobs: working-directory: apps/desktop/desktop_native run: | rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin node build.js cross-platform - name: Build @@ -1333,7 +1344,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/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml index a5e374395d8..6ae7edcc5c2 100644 --- a/.github/workflows/release-desktop-beta.yml +++ b/.github/workflows/release-desktop-beta.yml @@ -392,7 +392,7 @@ jobs: macos-build: name: MacOS Build - runs-on: macos-13 + runs-on: macos-15 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }} @@ -524,7 +524,7 @@ jobs: macos-package-github: name: MacOS Package GitHub Release Assets - runs-on: macos-13 + runs-on: macos-15 needs: - setup - macos-build @@ -556,7 +556,8 @@ jobs: node --version npm --version echo "GitHub ref: $GITHUB_REF" - echo "GitHub event: $GITHUB_EVENT" + echo "GitHub event: $GITHUB_EVENT" + xcodebuild -showsdks - name: Get Build Cache id: build-cache @@ -737,7 +738,7 @@ jobs: macos-package-mas: name: MacOS Package Prod Release Asset - runs-on: macos-13 + runs-on: macos-15 needs: - setup - macos-build @@ -770,6 +771,7 @@ jobs: npm --version echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" + xcodebuild -showsdks - name: Get Build Cache id: build-cache