Skip to content

ci(refresh-catalog): fetch branch before force-with-lease#15

Merged
danielnaab merged 1 commit into
mainfrom
ci/refresh-catalog-resilient-push
May 1, 2026
Merged

ci(refresh-catalog): fetch branch before force-with-lease#15
danielnaab merged 1 commit into
mainfrom
ci/refresh-catalog-resilient-push

Conversation

@danielnaab
Copy link
Copy Markdown
Member

Summary

  • Refresh-catalog workflow fails on re-run with git push --force-with-lease returning (stale info) because actions/checkout@v4 only fetches main and there's no remote-tracking ref for the dated catalog/refresh-* branch.
  • Adds an explicit fetch (best-effort) of the existing branch right before the push so the lease has a reference to compare against. First-time runs are unaffected (the || true covers the missing-branch case).

Repro

Today's scheduled run (25209783851, attempt 2) failed with:

! [rejected] catalog/refresh-2026-05-01 -> catalog/refresh-2026-05-01 (stale info)

Test plan

When attempt 1 of a scheduled run pushes the branch and a later attempt
re-runs the job, actions/checkout only fetches main. Without a
remote-tracking ref for the catalog/refresh-* branch, git push
--force-with-lease aborts with "stale info" and the workflow can never
succeed on retry. Explicitly fetch the branch (best-effort, since it may
not yet exist on first runs) so the lease has something to compare.
@danielnaab danielnaab temporarily deployed to preview/ci-refresh-catalog-resilient-push May 1, 2026 21:04 — with GitHub Actions Inactive
@danielnaab danielnaab merged commit 7e2a371 into main May 1, 2026
2 of 3 checks passed
@danielnaab danielnaab deleted the ci/refresh-catalog-resilient-push branch May 1, 2026 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant