From a4ee5fdcab0d5a4da341302bb2e052c71a87f80e Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Fri, 5 Feb 2021 12:56:26 +0100 Subject: [PATCH 1/2] Revert "Fix GitHub pull request ref, follow up for #3571" This reverts commit 2afab144c57edb7fd3710c579b5821b46224eb9b. --- .github/workflows/pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0036e5c99..5dedd579c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: actions/checkout@v2.3.4 with: - ref: refs/pull/${{ github.event.number }}/merge + ref: refs/pr/${{ github.event.number }}/merge repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Restore dependency cache @@ -88,7 +88,7 @@ jobs: steps: - uses: actions/checkout@v2.3.4 with: - ref: refs/pull/${{ github.event.number }}/merge + ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Restore dependency cache From 7b6285c7610bd2646f9971a346f50e5efc8298f9 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Fri, 5 Feb 2021 12:56:31 +0100 Subject: [PATCH 2/2] Revert "Attempt to run the CI on the test merge instead of the branch for each PR (#3585)" This reverts commit 7e0f14f95ae3139fb0359156cca8eed2986620b9. --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5dedd579c..a7d6e3e6c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: actions/checkout@v2.3.4 with: - ref: refs/pr/${{ github.event.number }}/merge + ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Restore dependency cache