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

[Manual Backport 2.x][CVE-2022-25860] Bumps simple-git from 3.15.1 to 3.16.0 #3348

Merged
merged 1 commit into from
Jan 27, 2023

Conversation

ananzh
Copy link
Member

@ananzh ananzh commented Jan 27, 2023

Backport PR
#3345

Issue Resolved
#3329

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

… 3.16.0

Backport PR
opensearch-project#3345

Issue Resolved
opensearch-project#3329

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
@ananzh ananzh requested a review from a team as a code owner January 27, 2023 04:50
@ananzh ananzh added backport 2.5 backport 1.3 Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry labels Jan 27, 2023
@ananzh ananzh added autocut Skip the changelog verification check on backports and removed Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry labels Jan 27, 2023
@AMoo-Miki AMoo-Miki removed the autocut Skip the changelog verification check on backports label Jan 27, 2023
@ananzh ananzh merged commit 728d5b1 into opensearch-project:2.x Jan 27, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-3348-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

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

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

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

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

Successfully merging this pull request may close these issues.

4 participants