Skip to content
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

Tweak label creation logic on backport workflows #6871

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Conversation

peterzhuamazon
Copy link
Member

Description

Tweak label creation logic on backport workflows

Issues Resolved

#6400

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member Author

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Copy link
Collaborator

@kolchfa-aws kolchfa-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@peterzhuamazon peterzhuamazon merged commit 801b6ec into main Apr 3, 2024
5 checks passed
@peterzhuamazon peterzhuamazon deleted the testmain branch April 3, 2024 21:53
@peterzhuamazon peterzhuamazon added the backport 2.13 PR: Backport label for 2.13 label Apr 3, 2024
@opensearch-trigger-bot
Copy link

The backport to 2.13 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.13 2.13
# Navigate to the new working tree
pushd ../.worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-6871-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 801b6ec266e8bd9766f52917dff0d92ccae524de
# Push it to GitHub
git push --set-upstream origin backport/backport-6871-to-2.13
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.13

Then, create a pull request where the base branch is 2.13 and the compare/head branch is backport/backport-6871-to-2.13.

@peterzhuamazon peterzhuamazon added backport 2.13 PR: Backport label for 2.13 and removed backport 2.13 PR: Backport label for 2.13 labels Apr 3, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 3, 2024
* Tweak label creation logic on backport workflows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Tweak label creation logic on backport workflows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 801b6ec)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Naarcha-AWS added a commit that referenced this pull request Apr 4, 2024
* Tweak label creation logic on backport workflows



* Tweak label creation logic on backport workflows



---------


(cherry picked from commit 801b6ec)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.13 PR: Backport label for 2.13 enhancement New feature or request workflows
Projects
Development

Successfully merging this pull request may close these issues.

2 participants