From 1261ccb56949d7e8e02dcf61d7a71af8bd684733 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 24 Oct 2023 14:31:13 +0200 Subject: [PATCH] Revert "ci: execute unit tests and tidy check against merge of PR branch and main (#2452)" This reverts commit 43f7d9f7368a575164bf8454cd4d848641ca1c26. --- .github/workflows/test-tidy.yml | 2 +- .github/workflows/test-unittest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-tidy.yml b/.github/workflows/test-tidy.yml index 2b3a0f847b..bb90eb669e 100644 --- a/.github/workflows/test-tidy.yml +++ b/.github/workflows/test-tidy.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: - # ref is unset here intentionally to ensure we test against a merge of PR and main branch + ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || '' }} # No token available for forks, so we can't push changes token: ${{ !github.event.pull_request.head.repo.fork && secrets.CI_COMMIT_PUSH_PR || '' }} diff --git a/.github/workflows/test-unittest.yml b/.github/workflows/test-unittest.yml index 9daf99817d..f2fbd209d0 100644 --- a/.github/workflows/test-unittest.yml +++ b/.github/workflows/test-unittest.yml @@ -32,7 +32,7 @@ jobs: - name: Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: - # ref is unset here intentionally to ensure we test against a merge of PR and main branch + ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || '' }} fetch-depth: 0 - name: Install AWS cli