chore: sync main into beta - #77
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>
## Summary - configure Release Please's prerelease versioning strategy for beta releases - retain the beta prerelease GitHub Release flag and beta version identifier ## Validation - JSON validation - git diff --check Supersedes beta Release PR #57, which generated a plain version because the versioning strategy was omitted. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
## Summary - accept both valid Release Please beta suffix forms: -beta and -beta.N - correct beta release version examples in the release guide ## Validation - actionlint - git diff --check - exercised guard matching for beta, beta.1, and stable versions Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Merges `beta` into `main` to promote the accumulated prerelease work (0.7.0-beta.1 – 0.7.0-beta.3) to a stable release. Includes: - feat(api): forward original Error to Faro's beforeSend via originalError (#53) - fix(errors): forward originalError for unhandledrejection via NaisErrorsInstrumentation (#68) - feat: export markErrorCaptured for custom error boundaries (#71) --------- Co-authored-by: Hans Kristian Flaatten <hans.kristian.flaatten@nav.no> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: sindrerh2 <--global>
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
2 participants
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.
Replaces #76, whose auto-generated head branch (
main) couldn't be used toresolve conflicts directly since
mainis protected.Synchronizes
mainintobetaafter promoting beta's prerelease work via #75.Brings the release-pipeline fixes that existed only on
mainintobeta:Conflicts resolved:
package.json: kept the beta version (0.7.0-beta.3), per RELEASING.mdguidance — not overwritten with main's stable
0.7.0.RELEASING.md: removed a duplicated paragraph introduced by thebidirectional history between
mainandbeta.