Skip to content

fix(ci): keep catalog updates from releases that land together #15

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
Quick104 merged 1 commit into from
Oct 2, 2026
Merged

fix(ci): keep catalog updates from releases that land together #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 28 additions & 16 deletions .github/workflows/update-catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ on:
permissions:
contents: write

# One group per plugin. GitHub keeps a single pending run per group and
# cancels any older pending run, so a shared group dropped one plugin's update
# whenever three releases landed together. A newer release of the same plugin
# supersedes an older pending one anyway; different plugins run in parallel and
# the push loop below resolves their races.
concurrency:
group: plugin-catalog-update
group: plugin-catalog-update-${{ inputs.repo || github.event.client_payload.repo }}

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 2, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Coordinate the legacy updater with the new groups

When the manual Update Manifest workflow overlaps a repository dispatch, this new per-repository group no longer matches .github/workflows/update-manifest.yml's unchanged plugin-catalog-update group. Those workflows can now edit and push manifest.json concurrently, but the legacy workflow still uses a single git pull --rebase origin main at lines 54–67 rather than this retry loop; if the dispatch pushes first—especially when both update the same or adjacent entry—the rebase can conflict and the requested manual update fails. Put the legacy updater under the same coordination/retry strategy before allowing these groups to run independently.

Useful? React with 👍 / 👎.

cancel-in-progress: false

jobs:
Expand All @@ -34,27 +39,34 @@ jobs:
with:
go-version: "1.26"

- name: Update catalog manifest
- name: Update and push the catalog
env:
GITHUB_TOKEN: ${{ github.token }}
PLUGIN_REPO: ${{ inputs.repo || github.event.client_payload.repo }}
PLUGIN_TAG: ${{ inputs.tag || github.event.client_payload.tag }}
run: |
test -n "$PLUGIN_REPO"
test -n "$PLUGIN_TAG"
go run ./cmd/update-catalog -repo "$PLUGIN_REPO" -tag "$PLUGIN_TAG"

- name: Commit catalog changes
env:
PLUGIN_REPO: ${{ inputs.repo || github.event.client_payload.repo }}
PLUGIN_TAG: ${{ inputs.tag || github.event.client_payload.tag }}
run: |
if git diff --quiet -- manifest.json; then
exit 0
fi
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add manifest.json
git commit -m "chore: update catalog for ${PLUGIN_REPO}@${PLUGIN_TAG}"
git pull --rebase origin main
git push origin HEAD:main
# A repository_dispatch run checks out main as it was when the release
# fired, and other releases may have updated the catalog since. Each
# attempt rebuilds the entry on the current main, so losing a push race
# retries instead of conflicting on manifest.json.
for attempt in 1 2 3 4 5; do
git fetch --quiet origin main
git reset --quiet --hard FETCH_HEAD
go run ./cmd/update-catalog -repo "$PLUGIN_REPO" -tag "$PLUGIN_TAG"
if git diff --quiet -- manifest.json; then
echo "The catalog already lists ${PLUGIN_REPO}@${PLUGIN_TAG}."
exit 0
fi
git add manifest.json
git commit --quiet -m "chore: update catalog for ${PLUGIN_REPO}@${PLUGIN_TAG}"
if git push origin HEAD:main; then
exit 0
fi
sleep $((attempt * 5))
done
echo "Could not push the catalog update after 5 attempts." >&2
exit 1