use feature branch for cadence->flow-go sync PRs #1441
Merged
Conversation
This file contains 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
Creates feature-secure-cadence branch off of master, if needed.
robert-e-davidson3
requested review from
turbolent,
SupunS and
dsainati1
as code owners
|
QUESTION: How do I test this?
|
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:master commit bbb0c74 Results
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
@robert-e-davidson3 feel free to merge |
SupunS
reviewed
Feb 23, 2022
branch names should be feature/ not feature- Co-authored-by: Supun Setunga <[email protected]>
SupunS
reviewed
Mar 1, 2022
| @@ -45,6 +47,16 @@ jobs: | |||
| NEW_BRANCH=auto-cadence-upgrade/$( date +%s )/${{ github.event.pull_request.head.ref }} | |||
| echo "NEW_BRANCH=$NEW_BRANCH" >> $GITHUB_ENV | |||
|
|
|||
| # create feature branch if needed | |||
| - name: Create feature-secure-cadence branch | |||
There was a problem hiding this comment.
@robert-e-davidson3 Shouldn't this match with the above branch name (feature/secure-cadence)?
| # create feature branch if needed | ||
| - name: Create feature-secure-cadence branch | ||
| uses: peterjgrainger/[email protected] | ||
| if: ${{ env.BASE_BRANCH == "feature-secure-cadence" }} |
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| branch: feature-secure-cadence |
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.
Creates feature-secure-cadence branch off of master, if needed.
Closes #1415
Description
We want to keep the flow-go and cadence repos synchronized. But that does not always extend to their master branches.
To this end every cadence PR that makes it into master creates a PR in the flow-go repo. They use a version of cadence that corresponds to the cadence PR that made it into master.
Currently we base off of the flow-go master branch. This is a problem because our cadence and flow-go releases are disjoint while cadence is undergoing major breaking changes in preparation for the secure cadence release. We don't want to add such breaking changes to flow-go releases in the meantime.
The solution here is to branch off of master into a new branch
feature-secure-cadence. This branch needs to be periodically (manually) synchronized with the flow-go master branch.When it's time to release secure cadence, the feature branch will be merged into master.
masterbranchFiles changedin the Github PR explorer