Skip to content

Commit 1365a8f

Browse files
committed
auto-cherry-pick fixes
1 parent 681375b commit 1365a8f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/auto-backport.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
github.event.pull_request.merged == true
1212
&& contains(github.event.pull_request.labels.*.name, 'cherry-pick')
1313
&& github.event.action == 'closed'
14-
)
1514
steps:
1615
- name: Cherry-pick action
1716
uses: sorenlouv/backport-github-action@929f69d04adbc196d982e60f02837b6cc00b3129

README.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ There are a few edge cases where we might want to work only on the current branc
8080

8181
=== Enable automatic cherry-picking on a PR
8282

83-
To enable automatic cherry-picking on a PR, add the label `auto-cherry-pick` to it.
83+
To enable automatic cherry-picking on a PR, add the label `cherry-pick` to it.
8484
Without it, the responsible GitHub action is not going to be triggered.
8585

86-
To select the target branches you would like to cherry-pick your PR to, add labels of the following structure: `auto-cherry-pick-to-<targetBranch>`.
87-
For example: `auto-cherry-pick-to-cypher-25` to cherry-pick it to the branch `cypher-25` or `auto-cherry-pick-to-5.x` for the branch `5.x`.
86+
To select the target branches you would like to cherry-pick your PR to, add labels of the following structure: `cherry-pick-to-<targetBranch>`.
87+
For example: `cherry-pick-to-cypher-25` to cherry-pick it to the branch `cypher-25` or `cherry-pick-to-5.x` for the branch `5.x`.
8888
You may even add new labels for branches that do not have such a label yet.
8989

90-
The feature is triggered by either merging a PR with the `auto-cherry-pick` label or by adding the `auto-cherry-pick` label to an already closed and merged PR.
91-
In the latter case, ensure that you first add the labels containing the target branches and then finally the `auto-cherry-pick` label.
90+
The feature is triggered by either merging a PR with the `cherry-pick` label or by adding the `cherry-pick` label to an already closed and merged PR.
91+
In the latter case, ensure that you first add the labels containing the target branches and then finally the `cherry-pick` label.
9292
Otherwise the automation starts without any target branches.
9393

9494

0 commit comments

Comments
 (0)