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

[TEST BACKPORT ONLY] Test backport PR #6869

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Conversation

peterzhuamazon
Copy link
Member

Description

Describe what this change achieves.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

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 merged commit 15f46c9 into testmain Apr 3, 2024
7 checks passed
@github-actions github-actions bot deleted the testmain_test123 branch April 3, 2024 20:39
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 3, 2024
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 15f46c9)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link

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

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

@peterzhuamazon peterzhuamazon added backport testmain2 backport-automerge Added by backport workflow for automerge and removed backport testmain2 backport-automerge Added by backport workflow for automerge labels Apr 3, 2024
@opensearch-trigger-bot
Copy link

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant