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

Backport main workflows to 1.3 branch #6909

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Backport main workflows to 1.3 branch #6909

merged 2 commits into from
Apr 5, 2024

Conversation

peterzhuamazon
Copy link
Member

Description

Backport main workflows to 1.3 branch

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 added enhancement New feature or request workflows labels Apr 5, 2024
@peterzhuamazon peterzhuamazon self-assigned this Apr 5, 2024
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon merged commit f495fef into 1.3 Apr 5, 2024
4 of 5 checks passed
@github-actions github-actions bot deleted the workflows-1.3 branch April 5, 2024 19:08
@kolchfa-aws kolchfa-aws added the backport 1.0 PR: Backport label for 1.0 label Jun 23, 2024
@opensearch-trigger-bot
Copy link
Contributor

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.0 PR: Backport label for 1.0 enhancement New feature or request workflows
Projects
Development

Successfully merging this pull request may close these issues.

2 participants