fix: reconcile useful open recipe PRs in weekly run
This commit is contained in:
@@ -145,6 +145,8 @@ echo "→ Reconciling open PRs on ${NAMESPACE}/${RECIPE}..."
|
||||
OPEN_PRS=$(curl -s "${AUTH[@]}" "${API}/repos/${NAMESPACE}/${RECIPE}/pulls?state=open&base=main&limit=50")
|
||||
# Close merged-upstream PRs (no-op merges); leave everything else open. Also pick an existing open
|
||||
# UPGRADE PR (branch 'upgrade-*' — this tool's convention) to EXTEND, if one exists.
|
||||
# RECIPE_PR_NUMBER explicitly selects another existing PR (for example a security fix) after the
|
||||
# caller has reviewed and carried its useful diff onto current main.
|
||||
EXTEND_PR=""; EXTEND_BRANCH=""
|
||||
while IFS=$'\t' read -r IDX HEAD_REF; do
|
||||
[ -n "${IDX:-}" ] || continue
|
||||
@@ -153,11 +155,18 @@ while IFS=$'\t' read -r IDX HEAD_REF; do
|
||||
continue
|
||||
fi
|
||||
echo " • PR #${IDX} (${HEAD_REF}) still open vs upstream main — leaving open"
|
||||
if [ "${MODE}" != "--reconcile-only" ] && [ -z "${EXTEND_PR}" ] && printf '%s' "${HEAD_REF}" | grep -q '^upgrade-'; then
|
||||
if [ "${MODE}" != "--reconcile-only" ] && [ -n "${RECIPE_PR_NUMBER:-}" ] && [ "${IDX}" = "${RECIPE_PR_NUMBER}" ]; then
|
||||
EXTEND_PR="${IDX}"; EXTEND_BRANCH="${HEAD_REF}"
|
||||
elif [ "${MODE}" != "--reconcile-only" ] && [ -z "${RECIPE_PR_NUMBER:-}" ] && [ -z "${EXTEND_PR}" ] && printf '%s' "${HEAD_REF}" | grep -q '^upgrade-'; then
|
||||
EXTEND_PR="${IDX}"; EXTEND_BRANCH="${HEAD_REF}"
|
||||
fi
|
||||
done < <(echo "${OPEN_PRS}" | jq -r '.[] | [(.number | tostring), .head.ref] | @tsv' 2>/dev/null || true)
|
||||
|
||||
if [ "${MODE}" != "--reconcile-only" ] && [ -n "${RECIPE_PR_NUMBER:-}" ] && [ "${EXTEND_PR}" != "${RECIPE_PR_NUMBER}" ]; then
|
||||
echo "ERROR: selected PR #${RECIPE_PR_NUMBER} is not an open PR against current main" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "${MODE}" = "--reconcile-only" ]; then
|
||||
echo "✓ reconcile-only done for ${NAMESPACE}/${RECIPE} (main synced; merged-upstream PRs closed)."
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user