Skip to content

Commit

Permalink
Merge pull request #7937 from LedgerHQ/fix/external-concurrency
Browse files Browse the repository at this point in the history
fix: external contribution concurrency
  • Loading branch information
KVNLS authored Sep 27, 2024
2 parents 08b19b0 + c47ab30 commit b79f61a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-and-test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/build-mobile-external-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test-desktop-external-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b79f61a

Please sign in to comment.