Skip to content

chore(ci): prevent duplicate container upgrade PRs #21901

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
gnodet merged 2 commits into from
Mar 10, 2026
Merged

chore(ci): prevent duplicate container upgrade PRs #21901

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eafa831
chore(ci): prevent duplicate container upgrade PRs
gnodet Mar 10, 2026
7cbaddf
chore(ci): close stale container PRs when a newer version is available
gnodet Mar 10, 2026
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
20 changes: 18 additions & 2 deletions .github/workflows/check-container-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,28 @@ jobs:
EOF
)

# Generate unique branch name
BRANCH_NAME="automated/upgrade-$(echo "$PROPERTY_NAME" | tr '.' '-' | tr '_' '-')-${NEW_VERSION}-${{ github.run_number }}"
# Generate branch name (deterministic per property+version, no run number)
BRANCH_NAME="automated/upgrade-$(echo "$PROPERTY_NAME" | tr '.' '-' | tr '_' '-')-${NEW_VERSION}"

echo "Creating PR: $PR_TITLE"
echo "Branch: $BRANCH_NAME"

# Check for existing open PR for the exact same property+version upgrade
EXISTING_PR=$(gh pr list --state open --head "$BRANCH_NAME" --json number --jq '.[0].number' 2>/dev/null || echo "")
if [[ -n "$EXISTING_PR" ]]; then
echo "⏭️ Skipping $PROPERTY_NAME $NEW_VERSION — open PR #$EXISTING_PR already exists"
continue
fi

# Check if there is an open PR for the same property but an older version — close it
STALE_PR=$(gh pr list --state open --label "container-images" --search "upgrade $PROPERTY_NAME" --json number,headRefName --jq '.[0]' 2>/dev/null || echo "")
if [[ -n "$STALE_PR" && "$STALE_PR" != "null" ]]; then
STALE_PR_NUMBER=$(echo "$STALE_PR" | jq -r '.number')
STALE_BRANCH=$(echo "$STALE_PR" | jq -r '.headRefName')
echo "🔄 Closing stale PR #$STALE_PR_NUMBER for $PROPERTY_NAME (superseded by $NEW_VERSION)"
gh pr close "$STALE_PR_NUMBER" --comment "Superseded by a newer version ($NEW_VERSION)." --delete-branch 2>/dev/null || true
fi

# Configure git
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
Expand Down