Skip to content

Commit becc758

Browse files
authored
retire auto-backports (#1085)
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
1 parent c3de43e commit becc758

File tree

5 files changed

+1
-319
lines changed

5 files changed

+1
-319
lines changed

.github/actions/scripts/do_backports.js

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/backport.yml

Lines changed: 0 additions & 167 deletions
This file was deleted.

.github/workflows/backport_reminder.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/do_backports.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -167,42 +167,9 @@ Java as early as possible.
167167

168168
To convert, import `scala.jdk.CollectionConverters.*`. You can then use `asScala` and `asJava` methods.
169169

170-
## Porting between branches
171-
172-
Note that we often maintain multiple branches in parallel, e.g. ones for the release-lines
173-
that are deployed on Prod clusters, or ones for previous or coming major releases. It is
174-
therefore quite common that we need to port commits between the different branches.
175-
176-
This can of course be done manually using `git` commands and github UI, but we also have
177-
automation to support it:
178-
179-
Automatically on PRs:
180-
- On every PR that satisfies a set of conditions, you will automatically get a reminder
181-
with a list of suggested branches you may wish to port this PR to. Check the boxes of
182-
those that fit (you can also edit the comment and add other branches if needed).
183-
- Once the PR is merged, automation (in GitHub Actions) will pick up that reminder comment
184-
and attempt to port this commit to the selected branches. If successful, you will be
185-
asked to review the port PRs. Upon failure, a comment will be added to the original PR.
186-
- Note that on any unmerged PR, you can add a comment yourself that includes the string
187-
`[backport]`, and any checked check box in that comment will be assumed to be a branch
188-
to which you wish to port this PR, e.g. a comment:
189-
190-
[backport]
191-
192-
\- [x] my-branch
193-
194-
will cause your PR to be ported to the "my-branch" branch once merged.
195-
196-
Manually:
197-
- There is also a manually triggered workflow for porting PRs that have already been merged.
198-
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),
199-
and press "Run workflow". You will be asked for a merged PR or a Git commit hash to port from,
200-
the branch to port to, and the reviewer to request the review from. Run the workflow to create
201-
a PR to port your contributions.
202-
203170
## Dev Docs
204171

205172
We publish docs from each commit from `main` to
206-
https://digital-asset.github.io/decentralized-canton-sync/. This can
173+
https://hyperledger-labs.github.io/splice/. This can
207174
often be useful to answer support requests with a docs link even if
208175
those docs are still very recent.

0 commit comments

Comments
 (0)