chore: improve backporting process #11924
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
github-actions
bot
added
the
chore
jschmid1
force-pushed
the
chore/improve-backporting-process
branch
from
f819915 to
8d62843
Compare
samugi
reviewed
Nov 6, 2023
jschmid1
force-pushed
the
chore/improve-backporting-process
branch
from
8d62843 to
9068648
Compare
samugi
reviewed
Nov 7, 2023
* now contains all the commits of a PR, not only the last one * now copies labels on the backport PRs * now copies milestones on the backport PRS * now copies requested reviewers to the backport PRS The action instructions for manually merging were mostly wrong and rarely worked. The actions are now more descriptive and separated (using worktrees) Signed-off-by: Joshua Schmid <jaiks@posteo.de>
jschmid1
force-pushed
the
chore/improve-backporting-process
branch
from
9068648 to
2a8191e
Compare
hanshuebner
approved these changes
Nov 8, 2023
StarlightIbuki
approved these changes
Nov 9, 2023
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/3.0.x
git worktree add -d .worktree/backport-11924-to-release/3.0.x origin/release/3.0.x
cd .worktree/backport-11924-to-release/3.0.x
git checkout -b backport-11924-to-release/3.0.x
ancref=$(git merge-base c74cbc72963c9d6ca9916c8f47b617901d8b22de 2a8191e26346ab5137442862bb87bfbb7c3b2b09)
git cherry-pick -x $ancref..2a8191e26346ab5137442862bb87bfbb7c3b2b09 |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/3.1.x
git worktree add -d .worktree/backport-11924-to-release/3.1.x origin/release/3.1.x
cd .worktree/backport-11924-to-release/3.1.x
git checkout -b backport-11924-to-release/3.1.x
ancref=$(git merge-base c74cbc72963c9d6ca9916c8f47b617901d8b22de 2a8191e26346ab5137442862bb87bfbb7c3b2b09)
git cherry-pick -x $ancref..2a8191e26346ab5137442862bb87bfbb7c3b2b09 |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/3.2.x
git worktree add -d .worktree/backport-11924-to-release/3.2.x origin/release/3.2.x
cd .worktree/backport-11924-to-release/3.2.x
git checkout -b backport-11924-to-release/3.2.x
ancref=$(git merge-base c74cbc72963c9d6ca9916c8f47b617901d8b22de 2a8191e26346ab5137442862bb87bfbb7c3b2b09)
git cherry-pick -x $ancref..2a8191e26346ab5137442862bb87bfbb7c3b2b09 |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/3.3.x
git worktree add -d .worktree/backport-11924-to-release/3.3.x origin/release/3.3.x
cd .worktree/backport-11924-to-release/3.3.x
git checkout -b backport-11924-to-release/3.3.x
ancref=$(git merge-base c74cbc72963c9d6ca9916c8f47b617901d8b22de 2a8191e26346ab5137442862bb87bfbb7c3b2b09)
git cherry-pick -x $ancref..2a8191e26346ab5137442862bb87bfbb7c3b2b09 |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release/3.4.x
git worktree add -d .worktree/backport-11924-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-11924-to-release/3.4.x
git checkout -b backport-11924-to-release/3.4.x
ancref=$(git merge-base c74cbc72963c9d6ca9916c8f47b617901d8b22de 2a8191e26346ab5137442862bb87bfbb7c3b2b09)
git cherry-pick -x $ancref..2a8191e26346ab5137442862bb87bfbb7c3b2b09 |
|
Successfully created backport PR for |
This was referenced Nov 10, 2023
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.
Summary
The action instructions for manually merging were mostly wrong and rarely worked.
Now they are more descriptive and isolated (using worktrees)
Fix https://konghq.atlassian.net/browse/KAG-2652