Skip to content

Commit 11c7c1e

Browse files
committed
test fix
1 parent 4303d68 commit 11c7c1e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/backport-assistant-prerun.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ jobs:
7878
id: check_merges
7979
if: needs.get-pr-info.outputs.has_no_backport == 'false'
8080
run: |
81-
MERGE_COMMITS=$(git log --merges --oneline origin/${{ github.base_ref }}..HEAD)
81+
BASE_REF="${{ github.event.pull_request.base.ref }}"
82+
MERGE_COMMITS=$(git log --merges --oneline origin/${{ BASE_REF }}..HEAD)
8283
if [ -n "$MERGE_COMMITS" ]; then
8384
echo "::error::Merge commits found."
8485
echo "merge_commit_found=true" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)