main: sync workflows main -> dev -> vX.Y-dev use sync branches #5010
Conversation
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
Steps: - create sync branch from base branch - merge head branch into sync branch - restore src/* and tests/* from base branch - commit & push - create PR for merging sync branch into base branch
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.
Fixes
The structure of the spec version development branches intentionally differs from the structure of the
mainbranch. In addition to the files inmainthe development branches containsrcfoldertestsfolderAll files except those in the
srcandtestsfolders should be identical betweenmainand the development branches, and are regularly synced frommain->dev->vX.Y-dev.Merging a spec release into
mainwith its full history makes subsequent the subsequent sync frommain->dev->vX.Y-deva bit more challenging than simply creating a PR merging the head branch into the base branch (which is what we did until now).A sync that preserves the intentionally different structure of the base branch needs to perform these steps:
src/*andtests/*files from base branch - these are the only intended structural differencesThis PR updates the two sync workflows to automatically perform these steps.
The workflows have been tested in fork https://github.com/ralfhandl/OpenAPI-Specification, both with an "initial" sync of a spec release from
main->dev->vX.Y-devand with subsequent syncs of changes to files inmainoutside of the two special folderssrcandtest:Release syncs:
Non-release syncs: