Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion .github/workflows/dependabot-catalog-convergence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ jobs:
exit 1
fi
response="$(gh api --method PUT "repos/${GITHUB_REPOSITORY}/pulls/${pr_number}/update-branch" -f "expected_head_sha=${current_head}" 2>&1)" || {
if ! grep -Fq 'already up to date' <<<"$response"; then
if grep -Eq 'already up to date|no new commits' <<<"$response"; then
# A branch that is already current is success, not failure;
# the poll below must not wait on an update that never ran.
response="already up to date"
else
printf '%s\n' "$response" >&2
exit 1
fi
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ The project follows Semantic Versioning.

## [Unreleased]

- **Fix the dependabot-catalog-convergence update-branch guard.** A bound
pull request already current with the base made the API answer
`no new commits`, which matched neither the success pattern nor a real
error — the job exited before converging the catalog and left
dependabot bumps red on `tool-registry`/`catalog`.

## [0.1.29] - 2026-09-28

- **Publishable re-cut of `0.1.28`.** Tag `0.1.28` was pushed as an unsigned
Expand Down
Loading