Skip to content

ci: add AI agent prompt to backport conflict comments #7367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christian-byrne merged 4 commits into from
Dec 15, 2025
Merged

ci: add AI agent prompt to backport conflict comments #7367

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9845f5a
ci: add AI agent prompt to backport conflict comments
christian-byrne Dec 11, 2025
182fafc
envsubst
christian-byrne Dec 12, 2025
478bcd8
ci: add envsubst availability check
christian-byrne Dec 15, 2025
756bb1e
ci: refactor COMMENT_BODY to use heredoc
christian-byrne Dec 15, 2025
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
Prev Previous commit
Next Next commit
ci: add envsubst availability check 
Install gettext-base if envsubst is not available on the runner.
While envsubst is typically present on ubuntu-latest, this adds
a safety net for the critical conflict-comment step.
  • Loading branch information
@christian-byrne
christian-byrne committed Dec 15, 2025
commit 478bcd8553233d50f26d002df9a80c3677000526
6 changes: 6 additions & 0 deletions .github/workflows/pr-backport.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,12 @@ jobs:
PR_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}"

export PR_NUMBER PR_URL MERGE_COMMIT target BACKPORT_BRANCH CONFLICTS_INLINE

# envsubst is provided by gettext-base
if ! command -v envsubst >/dev/null 2>&1; then
sudo apt-get update && sudo apt-get install -y gettext-base
fi

AGENT_PROMPT=$(envsubst '${PR_NUMBER} ${PR_URL} ${target} ${MERGE_COMMIT} ${BACKPORT_BRANCH} ${CONFLICTS_INLINE}' <<<"$BACKPORT_AGENT_PROMPT_TEMPLATE")

COMMENT_BODY="### ⚠️ Backport to \`${target}\` failed"$'\n\n'
Expand Down