From 4a003878e214a27d3eef0ab8713c53a057104379 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Wed, 23 Aug 2023 13:22:04 -0500 Subject: [PATCH] ci: retry install three times (#3924) --- .github/actions/setup-maker/action.yml | 8 ++++++-- .github/actions/setup-node/action.yml | 20 ++++++-------------- .github/workflows/nx.yml | 8 ++------ .github/workflows/release-desktop-app.yml | 2 -- 4 files changed, 14 insertions(+), 24 deletions(-) diff --git a/.github/actions/setup-maker/action.yml b/.github/actions/setup-maker/action.yml index 6861249b23..6f708f268d 100644 --- a/.github/actions/setup-maker/action.yml +++ b/.github/actions/setup-maker/action.yml @@ -6,9 +6,13 @@ runs: steps: - name: 'Install @electron-forge/maker-dmg' if: runner.os == 'macos' - shell: bash + uses: nick-fields/retry@v2 working-directory: ./apps/electron - run: yarn add @electron-forge/maker-dmg --dev + with: + timeout_minutes: 10 + max_attempts: 3 + retry_on: timeout + command: 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 2d9c6123fa..73d1c41181 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -39,20 +39,12 @@ runs: run: yarn config set nmMode hardlinks-local - name: yarn install - 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 }} + uses: nick-fields/retry@v2 + with: + timeout_minutes: 10 + max_attempts: 3 + retry_on: timeout + command: 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 9eb7448815..c7190aed21 100644 --- a/.github/workflows/nx.yml +++ b/.github/workflows/nx.yml @@ -10,8 +10,6 @@ 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: @@ -22,15 +20,13 @@ 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: macos-latest + runs-on: ubuntu-latest main-branch-name: master number-of-agents: 5 init-commands: | @@ -47,7 +43,7 @@ jobs: name: Nx Cloud - Agents uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0 with: - runs-on: macos-latest + runs-on: ubuntu-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 e326a64c65..74963c5502 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -103,10 +103,8 @@ 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