Skip to content

Commit 892980d

Browse files
committed
test fix
1 parent 11c7c1e commit 892980d

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
@@ -79,7 +79,7 @@ jobs:
7979
if: needs.get-pr-info.outputs.has_no_backport == 'false'
8080
run: |
8181
BASE_REF="${{ github.event.pull_request.base.ref }}"
82-
MERGE_COMMITS=$(git log --merges --oneline origin/${{ BASE_REF }}..HEAD)
82+
MERGE_COMMITS=$(git log --merges --oneline origin/$BASE_REF.HEAD)
8383
if [ -n "$MERGE_COMMITS" ]; then
8484
echo "::error::Merge commits found."
8585
echo "merge_commit_found=true" >> $GITHUB_OUTPUT
@@ -108,6 +108,7 @@ jobs:
108108
await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: prNumber, labels: [labelName] });
109109
await github.rest.issues.createComment({ owner: context.repo.owner, repo: context.repo.repo, issue_number: prNumber, body: commentBody });
110110
111+
- name:
111112
- name: Remove 'backport-error' label and comment
112113
if: steps.check_merges.outputs.merge_commit_found != 'true' && needs.get-pr-info.outputs.has_no_backport == 'false'
113114
uses: actions/github-script@v6

0 commit comments

Comments
 (0)