From 1fb5166376063bd63a0c981d475e53a7ac0f1f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= Date: Fri, 13 Oct 2023 10:44:26 +0200 Subject: [PATCH] ci: Fix wrong ref in PR workflows which broke external builds (#7431) Github issue / Community forum post (link here to close automatically): #7423 This PR updates reference passed to the `checkout` action by the `cy-pull-request.ym`. This should fix three existing issues: - Failing unit tests for external pull requests - Failing e2e tests for external PRs - Passing empty `ref` to `lint` job which makes linter run on a wrong branch --- .github/workflows/ci-pull-requests.yml | 6 +++--- .github/workflows/e2e-tests-pr.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml index e87b1a6d925f6..310e03096724e 100644 --- a/.github/workflows/ci-pull-requests.yml +++ b/.github/workflows/ci-pull-requests.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3.5.3 with: repository: n8n-io/n8n - ref: ${{ inputs.branch }} + ref: refs/pull/${{ github.event.pull_request.number }}/merge - uses: pnpm/action-setup@v2.4.0 @@ -37,7 +37,7 @@ jobs: uses: ./.github/workflows/units-tests-reusable.yml needs: install with: - ref: ${{ github.event.pull_request.head.ref }} + ref: refs/pull/${{ github.event.pull_request.number }}/merge cacheKey: ${{ github.sha }}-base:18-test-lint lint: @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v3.5.3 with: repository: n8n-io/n8n - ref: ${{ inputs.branch }} + ref: refs/pull/${{ github.event.pull_request.number }}/merge - uses: pnpm/action-setup@v2.4.0 diff --git a/.github/workflows/e2e-tests-pr.yml b/.github/workflows/e2e-tests-pr.yml index 1d9ead6db8fdc..3a3328cdb70ba 100644 --- a/.github/workflows/e2e-tests-pr.yml +++ b/.github/workflows/e2e-tests-pr.yml @@ -12,7 +12,7 @@ jobs: uses: ./.github/workflows/e2e-reusable.yml if: ${{ github.event.review.state == 'approved' && !contains(github.event.pull_request.labels.*.name, 'community') }} with: - branch: ${{ github.event.pull_request.head.ref }} + pr_number: ${{ github.event.pull_request.number }} user: ${{ github.event.pull_request.user.login || 'PR User' }} spec: 'e2e/*' secrets: