From 0d3e80785ed63ce602d84652ef2e047908b1b45f Mon Sep 17 00:00:00 2001 From: Kevin Le Seigle Date: Wed, 9 Oct 2024 17:48:45 +0200 Subject: [PATCH 1/2] fix: prNumber --- .github/workflows/build-and-test-external.yml | 10 +++++----- .github/workflows/build-and-test-pr.yml | 20 +++++++++---------- .github/workflows/build-desktop-reusable.yml | 8 ++------ .github/workflows/build-mobile-reusable.yml | 12 ++++------- 4 files changed, 21 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-and-test-external.yml b/.github/workflows/build-and-test-external.yml index 96769045a1fd..0f81ff5a1bb6 100644 --- a/.github/workflows/build-and-test-external.yml +++ b/.github/workflows/build-and-test-external.yml @@ -14,7 +14,7 @@ permissions: jobs: determine-affected: name: "Turbo Affected" - if: ${{github.event.pull_request.head.repo.full_name != github.repository }} + if: ${{github.event.pull_request.head.repo.fork }} 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 }} @@ -24,7 +24,7 @@ jobs: build-desktop-external: name: "[External] Build Desktop" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name != github.repository }} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.fork }} uses: LedgerHQ/ledger-live/.github/workflows/build-desktop-external-reusable.yml@develop with: ref: ${{ github.event.pull_request.head.ref }} @@ -34,7 +34,7 @@ jobs: test-desktop-external: name: "[External] Test Desktop" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name != github.repository }} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.fork }} uses: LedgerHQ/ledger-live/.github/workflows/test-desktop-external-reusable.yml@develop with: ref: ${{ github.event.pull_request.head.ref }} @@ -44,7 +44,7 @@ jobs: build-mobile-external: name: "[External] Build Mobile" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && github.event.pull_request.head.repo.full_name != github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/build-mobile-external-reusable.yml@develop with: ref: ${{ github.event.pull_request.head.ref }} @@ -59,7 +59,7 @@ jobs: - test-desktop-external - build-mobile-external runs-on: ubuntu-22.04 - if: ${{ always() && !cancelled() && github.event.pull_request.head.repo.full_name != github.repository }} + if: ${{ always() && !cancelled() && github.event.pull_request.head.repo.fork }} steps: - name: Check result if: contains(needs.*.result, 'failure') diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 37c55935c2e0..7aea53bd2b01 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -14,7 +14,7 @@ permissions: jobs: determine-affected: name: "Turbo Affected" - if: ${{github.event.pull_request.head.repo.full_name == github.repository }} + if: ${{!github.event.pull_request.head.repo.fork }} 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 }} @@ -24,14 +24,14 @@ jobs: build-desktop: name: "Build Desktop" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name == github.repository }} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && !github.event.pull_request.head.repo.fork }} uses: LedgerHQ/ledger-live/.github/workflows/build-desktop-reusable.yml@develop secrets: inherit test-desktop: name: "Test Desktop" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-desktop-reusable.yml@develop secrets: inherit @@ -39,21 +39,21 @@ jobs: build-mobile: name: "Build Mobile" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/build-mobile-reusable.yml@develop secrets: inherit test-mobile: name: "Test Mobile" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-mobile-reusable.yml@develop secrets: inherit test-mobile-e2e: name: "Test Mobile E2E" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-mobile-e2e-reusable.yml@develop secrets: inherit @@ -61,28 +61,28 @@ jobs: test-libraries: name: "Test Libraries" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'libs') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'libs') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-libs-reusable.yml@develop secrets: inherit test-design-system: name: "Test Design System" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'libs/ui') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'libs/ui') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-design-system-reusable.yml@develop secrets: inherit test-web-tools: name: "Test Web Tools" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'apps/web-tools') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'apps/web-tools') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-web-tools-reusable.yml@develop secrets: inherit test-cli: name: "Test CLI" needs: determine-affected - if: ${{contains(needs.determine-affected.outputs.paths, 'apps/cli') && github.event.pull_request.head.repo.full_name == github.repository}} + if: ${{contains(needs.determine-affected.outputs.paths, 'apps/cli') && !github.event.pull_request.head.repo.fork}} uses: LedgerHQ/ledger-live/.github/workflows/test-cli-reusable.yml@develop secrets: inherit diff --git a/.github/workflows/build-desktop-reusable.yml b/.github/workflows/build-desktop-reusable.yml index 4b0fab500e49..7e85f4f2adf0 100644 --- a/.github/workflows/build-desktop-reusable.yml +++ b/.github/workflows/build-desktop-reusable.yml @@ -19,10 +19,6 @@ on: description: The base branch to merge the head into when checking out the code type: string required: false - prNumber: - description: PR number - type: string - required: false permissions: id-token: write @@ -155,11 +151,11 @@ jobs: return JSON.stringify(obj); - uses: LedgerHQ/ledger-live/tools/actions/build-checks@develop - if: ${{ !cancelled() && inputs.prNumber != '' }} + if: ${{ !cancelled() && github.event.number != '' }} with: token: ${{ steps.generate-token.outputs.token }} baseBranch: ${{ inputs.base_ref || 'develop' }} - prNumber: ${{ inputs.prNumber }} + prNumber: ${{ github.event.number}} mode: desktop - uses: LedgerHQ/ledger-live/tools/actions/desktop-report-build@develop diff --git a/.github/workflows/build-mobile-reusable.yml b/.github/workflows/build-mobile-reusable.yml index 347fc148042d..5404593d9140 100644 --- a/.github/workflows/build-mobile-reusable.yml +++ b/.github/workflows/build-mobile-reusable.yml @@ -19,10 +19,6 @@ on: description: The base branch to merge the head into when checking out the code type: string required: false - prNumber: - description: PR number - type: string - required: false permissions: id-token: write @@ -111,8 +107,8 @@ jobs: with: max_attempts: 2 timeout_minutes: 15 - command: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm - new_command_on_retry: rm -rf ~/.cocoapods/ && pnpm clean && pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm + command: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm + new_command_on_retry: rm -rf ~/.cocoapods/ && pnpm clean && pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm - name: bundle ios and android js run: | pnpm build:llm:deps --api="http://127.0.0.1:${{ steps.caches.outputs.port }}" --token="${{ secrets.TURBOREPO_SERVER_TOKEN }}" --team="foo" @@ -144,11 +140,11 @@ jobs: with: name: mobile.metafile.json - uses: LedgerHQ/ledger-live/tools/actions/build-checks@develop - if: inputs.prNumber != '' + if: github.event.number != '' with: token: ${{ steps.generate-token.outputs.token }} baseBranch: ${{ inputs.base_ref || 'develop' }} - prNumber: ${{ inputs.prNumber }} + prNumber: ${{ github.event.number}} mode: mobile - uses: actions/github-script@v7 name: get statuses of runs From e5b259713449dfd268ef5f13d6cfda3199749079 Mon Sep 17 00:00:00 2001 From: Kevin Le Seigle Date: Thu, 17 Oct 2024 13:50:00 +0200 Subject: [PATCH 2/2] fix: do not upload screenshots diff to s3 for externals --- .github/workflows/test-desktop-external-reusable.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/test-desktop-external-reusable.yml b/.github/workflows/test-desktop-external-reusable.yml index d39b21a02ecb..e4f7ff0e1525 100644 --- a/.github/workflows/test-desktop-external-reusable.yml +++ b/.github/workflows/test-desktop-external-reusable.yml @@ -116,15 +116,6 @@ jobs: id: tests run: | xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright - - name: upload diffs to s3 - if: ${{ !cancelled() }} - uses: LedgerHQ/ledger-live/tools/actions/upload-images@develop - id: s3 - with: - path: apps/ledger-live-desktop/tests/artifacts/test-results - workspace: ${{ github.workspace }} - os: linux - group-name: ${{ github.ref_name }}-${{ github.run_id }}-${{ github.run_number }} - name: upload ci suggested screenshots if: ${{ !cancelled() }} uses: actions/upload-artifact@v4