-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Upgrade backport action to support failed labels #9270
Upgrade backport action to support failed labels #9270
Conversation
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
13ada92
to
dd0551b
Compare
Compatibility status:
|
Compatibility status:
|
Gradle Check (Jenkins) Run Completed with:
|
Compatibility status:
|
Codecov Report
@@ Coverage Diff @@
## main #9270 +/- ##
============================================
+ Coverage 71.03% 71.47% +0.44%
- Complexity 57347 57711 +364
============================================
Files 4771 4771
Lines 270587 270587
Branches 39564 39564
============================================
+ Hits 192209 193405 +1196
+ Misses 62232 61240 -992
+ Partials 16146 15942 -204 |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-1.x
# Create a new branch
git switch --create backport/backport-9270-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4711dccdb9b69c49ea48fde9e4516d75c9fe6e69
# Push it to GitHub
git push --set-upstream origin backport/backport-9270-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-1.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-9270-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4711dccdb9b69c49ea48fde9e4516d75c9fe6e69
# Push it to GitHub
git push --set-upstream origin backport/backport-9270-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x Then, create a pull request where the |
Manually creating the backport did not complain. Sus on the action upgrade
|
…9270) Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
…9270) Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
…9270) Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
…9270) Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
…9270) Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.