Repository navigation
Automate master-to-release/650 sync PRs after master releases - #2020
Merged
Merged
Conversation
Prefer release/650 for conflicting hunks and stop on unresolved conflicts. Require a dedicated release sync token for workflow changes and PR-triggered CI. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Remove the test file and PR-only test trigger/job while retaining the release and manual synchronization entry points. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Accessibility Violations Found
|
3 similar comments
Accessibility Violations Found
|
Accessibility Violations Found
|
Accessibility Violations Found
|
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.
Description
Add release-triggered synchronization from master to release/650:
git merge --no-ff -X ours: release/650 wins conflicting hunks, while non-conflicting master changes remain.Authentication: repository secret
RELEASE_SYNC_TOKENis now present (confirmed through secret metadata). It requires Contents, Pull requests, and Workflows write access (or classic PATpublic_repoandworkflowscopes for this public repository). The secret's value and permissions cannot be read back; they still require live workflow validation. No credential is included in this PR. Checkout and gh both use this token so workflow-file changes can be pushed and downstream PR checks can trigger. Missing credentials fail explicitly before checkout.The release/manual triggers become available only after this workflow is merged into master. No live release or dispatch has been triggered as part of this change.
Related Issue
Companion to manual release synchronization #2019, requested after release
core-forms-components-reactor-3.0.176. No separate tracking issue supplied.Motivation and Context
Remove the recurring manual effort of preparing a master-to-release/650 PR after master releases, while protecting release/650-specific conflicting content and retaining human review. Using release/650 as the checked-out merge base is essential:
oursmust refer to release/650, not master.How Has This Been Tested?
Validated the current revision on macOS:
bash -n .github/scripts/sync-master-to-release-650.sh: passed./Users/rismehta/.copilot/session-state/08b75ca8-f1e2-4e83-ad66-c74c4f59e58d/files/bin/shellcheck-v0.11.0/shellcheck .github/scripts/sync-master-to-release-650.sh: passed (ShellCheck 0.11.0, installed only in the session directory)./Users/rismehta/.copilot/session-state/08b75ca8-f1e2-4e83-ad66-c74c4f59e58d/files/bin/actionlint -shellcheck=/Users/rismehta/.copilot/session-state/08b75ca8-f1e2-4e83-ad66-c74c4f59e58d/files/bin/shellcheck-v0.11.0/shellcheck .github/workflows/sync-master-to-release-650.yml: passed (actionlint 1.7.7).git diff --cached --check: passed before committing.No application code was changed. Maven/AEM/Cypress tests were not run locally for this automation-only change. The earlier seven-case test suite and its PR job were removed as explicitly requested, so their previous passing result is not presented as current-revision CI evidence. The no-mistakes gate could not run because its CLI is not installed; direct shell and workflow checks above passed. End-to-end GitHub release/dispatch execution is not yet verified: the secret exists, but this workflow is not yet on master.
Manual acceptance check after review:
sync-pr.ymlcan stop the first run, as designed.Screenshots (if appropriate):
Types of changes
Checklist: