Skip to content

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 1 commit into from
Jun 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions .github/actions/scripts/do_backports.js

This file was deleted.

167 changes: 0 additions & 167 deletions .github/workflows/backport.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/backport_reminder.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/do_backports.yml

This file was deleted.

35 changes: 1 addition & 34 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

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


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
Copy link
Contributor Author

Choose a reason for hiding this comment

The 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.