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] Bump tough-cookie from 4.0.0 to 4.1.3 #4537

Merged
merged 2 commits into from
Jul 10, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 9bc61b4 from #4531.

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.0.0 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.0.0...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
(cherry picked from commit 9bc61b4)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot added the dependencies Pull requests that update a dependency file label Jul 10, 2023
@opensearch-trigger-bot opensearch-trigger-bot bot added the security fix Security fix generated by Mend label Jul 10, 2023
@opensearch-trigger-bot opensearch-trigger-bot bot added the autocut Skip the changelog verification check on backports label Jul 10, 2023
@codecov
Copy link

codecov bot commented Jul 10, 2023

Codecov Report

Merging #4537 (4a9f8eb) into 2.x (a287203) will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              2.x    #4537   +/-   ##
=======================================
  Coverage   66.44%   66.44%           
=======================================
  Files        3287     3287           
  Lines       63286    63286           
  Branches     9846     9846           
=======================================
+ Hits        42049    42051    +2     
+ Misses      18857    18856    -1     
+ Partials     2380     2379    -1     
Flag Coverage Δ
Linux 66.39% <ø> (+<0.01%) ⬆️
Windows 66.38% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

@ZilongX ZilongX merged commit 898410d into 2.x Jul 10, 2023
46 of 47 checks passed
@ZilongX ZilongX deleted the backport/backport-4531-to-2.x branch July 10, 2023 23:48
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.9 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.9 2.9
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.9
# Create a new branch
git switch --create backport/backport-4537-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 898410dd3490e2ebba1490f5845db30fc1a6a003
# Push it to GitHub
git push --set-upstream origin backport/backport-4537-to-2.9
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.9

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

@AMoo-Miki
Copy link
Collaborator

2.9 didn't exist then; this change is in 2.9 that was cut after this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
all-star-contributor autocut Skip the changelog verification check on backports dependencies Pull requests that update a dependency file security fix Security fix generated by Mend v2.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants