Skip to content

fix: prevent deploy race condition when pushing versioned artifacts#5

Merged
leseb merged 1 commit into
mainfrom
leseb/fix-ci-deploy-conflict
Apr 29, 2026
Merged

fix: prevent deploy race condition when pushing versioned artifacts#5
leseb merged 1 commit into
mainfrom
leseb/fix-ci-deploy-conflict

Conversation

@leseb
Copy link
Copy Markdown
Contributor

@leseb leseb commented Apr 29, 2026

Summary

Fixes the CI failure where the "Commit archived version" step fails with ! [rejected] main -> main (fetch first) when main moves between checkout and push.

  • Adds workflow-level concurrency control (cancel-in-progress: false) so deploy runs queue instead of racing each other.
  • Adds git pull --rebase origin main before git push to handle external pushes that land on main during the build.

Fixes: https://github.com/ogx-ai/ogx-ai.github.io/actions/runs/25106969229/job/73570592029

Add concurrency control to queue workflow runs and pull-rebase before
push so the commit step handles a main branch that moved since checkout.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@leseb leseb merged commit 6b90ded into main Apr 29, 2026
1 check passed
@leseb leseb deleted the leseb/fix-ci-deploy-conflict branch April 29, 2026 12:39
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