diff --git a/.github/actions/setup-maker/action.yml b/.github/actions/setup-maker/action.yml index 6f708f268d..6861249b23 100644 --- a/.github/actions/setup-maker/action.yml +++ b/.github/actions/setup-maker/action.yml @@ -6,13 +6,9 @@ runs: steps: - name: 'Install @electron-forge/maker-dmg' if: runner.os == 'macos' - uses: nick-fields/retry@v2 + shell: bash working-directory: ./apps/electron - with: - timeout_minutes: 10 - max_attempts: 3 - retry_on: timeout - command: yarn add @electron-forge/maker-dmg --dev + run: yarn add @electron-forge/maker-dmg --dev env: HUSKY: '0' PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1' diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index 73d1c41181..2d9c6123fa 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -39,12 +39,20 @@ runs: run: yarn config set nmMode hardlinks-local - name: yarn install - uses: nick-fields/retry@v2 - with: - timeout_minutes: 10 - max_attempts: 3 - retry_on: timeout - command: yarn install ${{ inputs.extra-flags }} + if: ${{ inputs.package-install == 'true' }} + continue-on-error: true + shell: bash + run: yarn install ${{ inputs.extra-flags }} + env: + HUSKY: '0' + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1' + ELECTRON_SKIP_BINARY_DOWNLOAD: '1' + SENTRYCLI_SKIP_DOWNLOAD: '1' + + - name: yarn install (try again) + if: ${{ steps.install.outcome == 'failure' }} + shell: bash + run: yarn install ${{ inputs.extra-flags }} env: HUSKY: '0' PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1' diff --git a/.github/workflows/nx.yml b/.github/workflows/nx.yml index c7190aed21..9eb7448815 100644 --- a/.github/workflows/nx.yml +++ b/.github/workflows/nx.yml @@ -10,6 +10,8 @@ on: - README.md - .github/** - '!.github/workflows/nx.yml' + - '!.github/actions/build-rust/action.yml' + - '!.github/actions/setup-node/action.yml' pull_request: merge_group: branches: @@ -20,13 +22,15 @@ on: - README.md - .github/** - '!.github/workflows/nx.yml' + - '!.github/actions/build-rust/action.yml' + - '!.github/actions/setup-node/action.yml' jobs: main: name: Nx Cloud - Main Job uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0 with: - runs-on: ubuntu-latest + runs-on: macos-latest main-branch-name: master number-of-agents: 5 init-commands: | @@ -43,7 +47,7 @@ jobs: name: Nx Cloud - Agents uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0 with: - runs-on: ubuntu-latest + runs-on: macos-latest number-of-agents: 5 environment-variables: | BUILD_TYPE=canary diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 74963c5502..e326a64c65 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -103,8 +103,10 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Node.js + timeout-minutes: 10 uses: ./.github/actions/setup-node - name: Setup Maker + timeout-minutes: 10 uses: ./.github/actions/setup-maker - name: Build AFFiNE native uses: ./.github/actions/build-rust