From c47ab30a542cbf08a192a84ba3b1fcad08b8bdf5 Mon Sep 17 00:00:00 2001 From: Kevin Le Seigle Date: Fri, 27 Sep 2024 11:38:00 +0200 Subject: [PATCH] fix: external contribution concurrency --- .github/workflows/build-and-test-pr.yml | 1 + .../workflows/build-mobile-external-reusable.yml | 8 ++------ .../workflows/test-desktop-external-reusable.yml | 14 +++++++------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index cf2b38919b9e..37c55935c2e0 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -14,6 +14,7 @@ permissions: jobs: determine-affected: name: "Turbo Affected" + if: ${{github.event.pull_request.head.repo.full_name == github.repository }} uses: LedgerHQ/ledger-live/.github/workflows/turbo-affected-reusable.yml@develop with: head_branch: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }} diff --git a/.github/workflows/build-mobile-external-reusable.yml b/.github/workflows/build-mobile-external-reusable.yml index 30b9dc52fd37..54a3e5e338ce 100644 --- a/.github/workflows/build-mobile-external-reusable.yml +++ b/.github/workflows/build-mobile-external-reusable.yml @@ -16,17 +16,13 @@ on: description: The base branch to merge the head into when checking out the code required: false -concurrency: - group: ${{ github.workflow }}-${{ github.ref_name != 'develop' && github.ref || github.run_id }} - cancel-in-progress: true - permissions: contents: read jobs: build-mobile-app-android: name: "Build Ledger Live Mobile (Android)" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: NODE_OPTIONS: "--max-old-space-size=7168" steps: @@ -105,7 +101,7 @@ jobs: run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm report: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [build-mobile-app-android, build-mobile-app-ios] if: ${{ !cancelled() && github.event_name == 'workflow_dispatch' }} steps: diff --git a/.github/workflows/test-desktop-external-reusable.yml b/.github/workflows/test-desktop-external-reusable.yml index 3069cf438fd1..2bebf4a239d2 100644 --- a/.github/workflows/test-desktop-external-reusable.yml +++ b/.github/workflows/test-desktop-external-reusable.yml @@ -27,8 +27,8 @@ jobs: env: NODE_OPTIONS: "--max-old-space-size=7168" FORCE_COLOR: 3 - CI_OS: ubuntu-latest - runs-on: ubuntu-latest + CI_OS: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: @@ -63,8 +63,8 @@ jobs: env: NODE_OPTIONS: "--max-old-space-size=7168" FORCE_COLOR: 3 - CI_OS: ubuntu-latest - runs-on: ubuntu-latest + CI_OS: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: @@ -84,11 +84,11 @@ jobs: env: NODE_OPTIONS: "--max-old-space-size=7168" FORCE_COLOR: 3 - CI_OS: ubuntu-latest + CI_OS: ubuntu-22.04 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 # DEBUG: "pw:browser*" # DEBUG_LOGS: 1 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: status: ${{ steps.tests.outcome }} steps: @@ -147,7 +147,7 @@ jobs: report: needs: [codechecks, unit-tests, e2e-tests-linux] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ !cancelled() && github.event_name == 'workflow_dispatch' }} steps: - uses: actions/checkout@v4