From 839f50097931671ddc97340ee62cea2aba691853 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Thu, 9 Nov 2023 19:58:55 +0800 Subject: [PATCH] ci: disable postinstall on macOS build (#4885) --- .github/actions/build-rust/action.yml | 2 ++ .github/actions/setup-node/action.yml | 9 +++++++++ .github/workflows/build-desktop.yml | 1 + .github/workflows/release-desktop-app.yml | 5 +++-- yarn.lock | 4 ++-- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-rust/action.yml b/.github/actions/build-rust/action.yml index 8d08b75f2d..506be71409 100644 --- a/.github/actions/build-rust/action.yml +++ b/.github/actions/build-rust/action.yml @@ -19,6 +19,8 @@ runs: with: toolchain: stable targets: ${{ inputs.target }} + env: + CARGO_INCREMENTAL: '1' - name: Cache cargo uses: actions/cache@v3 diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index cc1aab9a4c..d74ec72f19 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -32,6 +32,10 @@ inputs: nmHoistingLimits: description: 'Set nmHoistingLimits in .yarnrc.yml' required: false + enableScripts: + description: 'Set enableScripts in .yarnrc.yml' + required: false + default: 'true' runs: using: 'composite' @@ -54,6 +58,11 @@ runs: shell: bash run: yarn config set nmHoistingLimits ${{ inputs.nmHoistingLimits }} + - name: Set enableScripts + if: ${{ inputs.enableScripts == 'false' }} + shell: bash + run: yarn config set enableScripts false + - name: yarn install if: ${{ inputs.package-install == 'true' }} continue-on-error: true diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 6c701f5700..2ffbfbcb6a 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -118,6 +118,7 @@ jobs: extra-flags: workspaces focus @affine/electron @affine/monorepo @affine-test/affine-desktop playwright-install: true hard-link-nm: false + enableScripts: false - name: Build AFFiNE native uses: ./.github/actions/build-rust diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 59f68b4ad8..33abe80447 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -80,11 +80,11 @@ jobs: # For windows, we need a separate approach matrix: spec: - - runner: macos-latest-xlarge + - runner: macos-latest platform: darwin arch: x64 target: x86_64-apple-darwin - - runner: macos-latest-xlarge + - runner: macos-latest platform: darwin arch: arm64 target: aarch64-apple-darwin @@ -109,6 +109,7 @@ jobs: hard-link-nm: false build-plugins: false nmHoistingLimits: workspaces + enableScripts: false - name: Build AFFiNE native uses: ./.github/actions/build-rust with: diff --git a/yarn.lock b/yarn.lock index 436d603bf3..3d1e061ec4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25990,8 +25990,8 @@ __metadata: linkType: hard "macos-alias@npm:macos-alias-building@latest": - version: 0.2.13 - resolution: "macos-alias-building@npm:0.2.13" + version: 0.2.14 + resolution: "macos-alias-building@npm:0.2.14" conditions: os=darwin languageName: node linkType: hard