Skip to content

ci: auto-resolve version conflicts in promote-stable workflow#3194

Merged
caio-pizzol merged 2 commits into
mainfrom
fix-promote-stable-autoresolve
May 7, 2026
Merged

ci: auto-resolve version conflicts in promote-stable workflow#3194
caio-pizzol merged 2 commits into
mainfrom
fix-promote-stable-autoresolve

Conversation

@caio-pizzol
Copy link
Copy Markdown
Contributor

Mirrors the auto-resolve block from sync-patches.yml so the promote-main-to-stable workflow handles the same recurring version-file conflicts without paging a human. Stable's version is kept (npm/PyPI already published it); source conflicts still fall through to manual resolution.

  • matches package.json, pyproject.toml, and version.json under any path
  • adds an auto_resolved PR body branch for the new clean-but-resolved case
  • no behavior change on clean merges or on real source conflicts

PR #3193 was the most recent example: all 22 conflicts were release artifacts that this workflow would have resolved automatically.

@caio-pizzol caio-pizzol requested a review from a team as a code owner May 7, 2026 20:21
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e8b7ae82a2

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread .github/workflows/promote-stable.yml
Comment thread .github/workflows/promote-stable.yml Outdated
@caio-pizzol caio-pizzol merged commit 436531c into main May 7, 2026
10 checks passed
@caio-pizzol caio-pizzol deleted the fix-promote-stable-autoresolve branch May 7, 2026 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant