add sync-upstream action #538
Open
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.
This PR adds a reusable action to sync a forked repo with any number of upstream branches
Intended workflow:
graph TB %% Upstream subgraph "Upstream" UP_Main["Main Branch"] UP_Release["Release Branch (1.2)"] end %% Fork subgraph "Fork" FORK_Main["Main Branch"] FORK_Release["Release Branch (1.2)"] FORK_CVE["CVE Patch Branch (release-1.2-cve1)"] end %% Sync Workflow (runs in main branch) subgraph "Sync Workflow" Sync_Action["GitHub Action: Sync Upstream Release"] end %% Security Patch Process subgraph "Security Patch Process" Step_Create["1. Create CVE Branch"] Step_PR["2. Open Pull Request"] Step_Merge["3. Squash & Merge"] Step_Tag["4. Tag Release"] end %% Sync Workflow Connections FORK_Main --> Sync_Action UP_Release -->|Sync| Sync_Action Sync_Action --> FORK_Release %% Security Patch Process Connections FORK_Release -->|Branch off to create| FORK_CVE Step_Create --> FORK_CVE FORK_CVE --> Step_PR Step_PR --> Step_Merge Step_Merge --> Step_Tag