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 2.x][CVE-2022-33987]Bump makelogs to remove dependency on got (#2801) #2802

Merged
merged 1 commit into from
Nov 4, 2022

Conversation

ananzh
Copy link
Member

@ananzh ananzh commented Nov 4, 2022

  • Bump makelogs to remove dependency on got
  • Also dusted off the lock file a bit

Fixes #1764

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

…ot (opensearch-project#2801)

* Also dusted off the lock file a bit

Fixes opensearch-project#1764

Signed-off-by: Miki <miki@amazon.com>

Signed-off-by: Miki <miki@amazon.com>
@ananzh ananzh requested a review from a team as a code owner November 4, 2022 23:20
@ananzh ananzh added backport 2.4 cve Security vulnerabilities detected by Dependabot or Mend labels Nov 4, 2022
@AMoo-Miki AMoo-Miki added the autocut Skip the changelog verification check on backports label Nov 4, 2022
@ananzh ananzh merged commit 994731d into opensearch-project:2.x Nov 4, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

@joshuarrrr joshuarrrr added the v2.4.0 'Issues and PRs related to version v2.4.0' label Mar 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autocut Skip the changelog verification check on backports cve Security vulnerabilities detected by Dependabot or Mend v2.4.0 'Issues and PRs related to version v2.4.0'
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants