ci: execute unit tests and tidy check against merge of PR branch and …

…main (#2452)
edgelesssys · Oct 16, 2023 · 43f7d9f · 43f7d9f
1 parent 776d43d
commit 43f7d9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || '' }}
+          # ref is unset here intentionally to ensure we test against a merge of PR and main branch
           # 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
@@ -32,7 +32,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
-          ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || '' }}
+          # ref is unset here intentionally to ensure we test against a merge of PR and main branch
           fetch-depth: 0
 
       - name: Install AWS cli