Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/sync-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ jobs:

ISSUE_NUMBER="$(gh issue list --label "$CONFLICT_LABEL" --state open --json number --jq '.[0].number' || true)"
if [ -n "$ISSUE_NUMBER" ] && [ "$ISSUE_NUMBER" != "null" ]; then
gh issue edit "$ISSUE_NUMBER" --title "$CONFLICT_TITLE" --body-file "$BODY_FILE" --add-label automation --add-label upstream-sync --add-label "$CONFLICT_LABEL"
gh issue edit "$ISSUE_NUMBER" --title "$CONFLICT_TITLE" --body-file "$BODY_FILE"
else
gh issue create --title "$CONFLICT_TITLE" --body-file "$BODY_FILE" --label automation --label upstream-sync --label "$CONFLICT_LABEL"
gh issue create --title "$CONFLICT_TITLE" --body-file "$BODY_FILE"
fi

- name: Stop on merge conflict
Expand Down
Loading