-
Notifications
You must be signed in to change notification settings - Fork 18
retire auto-backports #1085
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
retire auto-backports #1085
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -167,42 +167,9 @@ Java as early as possible. | |
|
||
To convert, import `scala.jdk.CollectionConverters.*`. You can then use `asScala` and `asJava` methods. | ||
|
||
## Porting between branches | ||
|
||
Note that we often maintain multiple branches in parallel, e.g. ones for the release-lines | ||
that are deployed on Prod clusters, or ones for previous or coming major releases. It is | ||
therefore quite common that we need to port commits between the different branches. | ||
|
||
This can of course be done manually using `git` commands and github UI, but we also have | ||
automation to support it: | ||
|
||
Automatically on PRs: | ||
- On every PR that satisfies a set of conditions, you will automatically get a reminder | ||
with a list of suggested branches you may wish to port this PR to. Check the boxes of | ||
those that fit (you can also edit the comment and add other branches if needed). | ||
- Once the PR is merged, automation (in GitHub Actions) will pick up that reminder comment | ||
and attempt to port this commit to the selected branches. If successful, you will be | ||
asked to review the port PRs. Upon failure, a comment will be added to the original PR. | ||
- Note that on any unmerged PR, you can add a comment yourself that includes the string | ||
`[backport]`, and any checked check box in that comment will be assumed to be a branch | ||
to which you wish to port this PR, e.g. a comment: | ||
|
||
[backport] | ||
|
||
\- [x] my-branch | ||
|
||
will cause your PR to be ported to the "my-branch" branch once merged. | ||
|
||
Manually: | ||
- There is also a manually triggered workflow for porting PRs that have already been merged. | ||
To use that, navigate to the ["Backport a commit or PR across branches" workflow in the repo's Actions page](https://github.com/DACH-NY/canton-network-node/actions/workflows/backport.yml), | ||
and press "Run workflow". You will be asked for a merged PR or a Git commit hash to port from, | ||
the branch to port to, and the reviewer to request the review from. Run the workflow to create | ||
a PR to port your contributions. | ||
|
||
## Dev Docs | ||
|
||
We publish docs from each commit from `main` to | ||
https://digital-asset.github.io/decentralized-canton-sync/. This can | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. drive-by |
||
https://hyperledger-labs.github.io/splice/. This can | ||
often be useful to answer support requests with a docs link even if | ||
those docs are still very recent. |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moving this to internal README