chore: sync main into beta - #56
Merged
Merged
Conversation
## Summary - create a reviewable sync PR from main to beta after each main push - run the ci-ok check for pull requests targeting beta - document beta synchronization and protection requirements ## Validation - actionlint - git diff --check The beta ruleset could not be created from this session because GitHub API write operations are blocked by the sandbox. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
## Summary - restrict beta manual publishing to workflow dispatches run from the beta branch - document the required beta-branch dispatch Supersedes #46, which conflicts because #45 was squash-merged. ## Validation - actionlint - git diff --check Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
## Summary - document stable-only and beta-first release flows - document how to resolve beta synchronization release-state conflicts - restore repository scoping and explicit GitHub CLI failure handling in the beta sync workflow ## Validation - actionlint - git diff --check Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
## Summary - configure the beta Release Please workflow with target-branch: beta - prevent beta release runs from using main release state or updating main Release PRs ## Validation - actionlint - git diff --check Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
🟡 Changes recommended
The updated beta protection guidance recommends squash-only merges for sync PRs, which can undermine clean branch synchronization by not recording main as an ancestor.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Adds an automated mechanism to keep the beta branch synchronized with main, and documents stable vs beta release processes so branch sync and prerelease publishing are clearly separated.
Changes:
- Document stable-only releases vs beta-first releases, plus guidance for resolving sync conflicts (
RELEASING.md). - Add a workflow that opens a “chore: sync main into beta” PR on pushes to
main(.github/workflows/sync-beta.yml). - Ensure CI runs for PRs targeting
beta, and adjust beta release automation to explicitly target thebetabranch (.github/workflows/ci.yaml,.github/workflows/release-please-beta.yml).
File summaries
| File | Description |
|---|---|
| RELEASING.md | Updates release process documentation for stable and beta flows and beta synchronization. |
| .github/workflows/sync-beta.yml | New workflow to open/maintain a sync PR from main into beta. |
| .github/workflows/release-please-beta.yml | Explicitly targets beta for release-please and tightens publish conditions. |
| .github/workflows/ci.yaml | Expands PR CI coverage to include PRs targeting beta and pins actions by SHA. |
Review details
- Files reviewed: 4/4 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+119
to
+121
| Protect `beta` from deletion and force-pushes. Require pull requests, one approving review, | ||
| linear history, and the `ci-ok` status check. Allow squash merges only. Do not grant the | ||
| synchronization workflow a ruleset bypass. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Synchronizes
mainintobeta. Merge this PR after CI passes. This updates the beta branch but does not publish a beta package.