diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml index 5895e8d82b9e3..e6d4cdabd741c 100644 --- a/.github/workflows/ci-pull-requests.yml +++ b/.github/workflows/ci-pull-requests.yml @@ -112,12 +112,13 @@ jobs: name: E2E [Electron/Node 16] uses: ./.github/workflows/e2e-reusable.yml with: - branch: ${{ github.event.pull_request.head.ref }} + branch: ${{ github.event.pull_request.base.ref }} user: ${{ github.event.inputs.user || 'PR User' }} spec: ${{ github.event.inputs.spec || 'e2e/0-smoke.cy.ts' }} - run-env: base:16.18.1 + run-env: browsers:node16.18.0-chrome107-ff106-edge record: false parallel: false + pr_number: ${{ github.event.number }} containers: '[1]' secrets: CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml index df2b04a058d74..45b842044ba8f 100644 --- a/.github/workflows/e2e-reusable.yml +++ b/.github/workflows/e2e-reusable.yml @@ -7,7 +7,6 @@ on: description: 'GitHub branch to test.' required: false type: string - default: 'master' user: description: 'User who kicked this off.' required: false @@ -43,6 +42,10 @@ on: required: false default: '[1, 2, 3, 4, 5, 6, 7, 8]' type: string + pr_number: + description: 'PR number to run tests for.' + required: false + type: number secrets: CYPRESS_RECORD_KEY: description: 'Cypress record key.' @@ -79,6 +82,12 @@ jobs: repository: n8n-io/n8n ref: ${{ inputs.branch }} + - name: Checkout PR + if: ${{ inputs.pr_number }} + run: | + git fetch origin pull/${{ inputs.pr_number }}/head + git checkout FETCH_HEAD + - name: Setup pnpm uses: pnpm/action-setup@v2.2.4 with: @@ -123,6 +132,12 @@ jobs: repository: n8n-io/n8n ref: ${{ inputs.branch }} + - name: Checkout PR + if: ${{ inputs.pr_number }} + run: | + git fetch origin pull/${{ inputs.pr_number }}/head + git checkout FETCH_HEAD + - name: Setup pnpm uses: pnpm/action-setup@v2.2.4