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

Initial changes add backport automerge label #6865

Conversation

peterzhuamazon
Copy link
Member

Description

Initial changes add backport automerge label

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 peterzhuamazon force-pushed the initial-changes-add-backport-automerge-label branch from 3bb39c3 to a799e88 Compare April 2, 2024 23:34
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. Thank you, @peterzhuamazon!

@peterzhuamazon peterzhuamazon merged commit afa4d27 into opensearch-project:main Apr 3, 2024
4 checks passed
@peterzhuamazon peterzhuamazon deleted the initial-changes-add-backport-automerge-label branch April 3, 2024 20:11
@opensearch-trigger-bot
Copy link

The backport to testmain 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-testmain testmain
# Navigate to the new working tree
pushd ../.worktrees/backport-testmain
# Create a new branch
git switch --create backport/backport-6865-to-testmain
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 afa4d2754a23cba4d7d92c6c5bc669561966977d
# Push it to GitHub
git push --set-upstream origin backport/backport-6865-to-testmain
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-testmain

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

@peterzhuamazon peterzhuamazon added backport 2.13 PR: Backport label for 2.13 and removed backport testmain labels Apr 3, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 3, 2024
* Add a label to backport PRs in preparation for backport automerge

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

* Small tweaks

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

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit afa4d27)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon pushed a commit that referenced this pull request Apr 3, 2024
* Add a label to backport PRs in preparation for backport automerge



* Small tweaks



---------


(cherry picked from commit afa4d27)

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>
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