Skip to content

Commit fa10a1d

Browse files
author
MarcoFalke
committed
ci: Use GITHUB_BASE_REF over hard-coded master
1 parent fa0d0be commit fa10a1d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
fi
7373
echo "TEST_BASE=$(git rev-list -n$((${{ env.MAX_COUNT }} + 1)) --reverse HEAD $EXCLUDE_MERGE_BASE_ANCESTORS | head -1)" >> "$GITHUB_ENV"
7474
- run: |
75-
git fetch origin master
75+
git fetch origin "${GITHUB_BASE_REF}"
7676
git config user.email "[email protected]"
7777
git config user.name "CI"
7878
- run: |
@@ -81,7 +81,7 @@ jobs:
8181
- name: Compile and run tests
8282
run: |
8383
# Run tests on commits after the last merge commit and before the PR head commit
84-
git rebase --exec "git merge --no-commit origin/master && ./.github/ci-test-each-commit-exec.sh && git reset --hard" ${{ env.TEST_BASE }}
84+
git rebase --exec "git merge --no-commit origin/${GITHUB_BASE_REF} && ./.github/ci-test-each-commit-exec.sh && git reset --hard" ${{ env.TEST_BASE }}
8585
8686
macos-native-arm64:
8787
name: ${{ matrix.job-name }}

0 commit comments

Comments
 (0)