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] Upgrade org.bouncycastle:bcprov-jdk18on to 1.78.1 #3020

Merged
merged 3 commits into from
Sep 17, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 2506468 from #3004.

Signed-off-by: Peng Huo <[email protected]>
(cherry picked from commit 2506468)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link

codecov bot commented Sep 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.38%. Comparing base (2bf7a90) to head (b9a941d).
Report is 13 commits behind head on 2.x.

Additional details and impacted files
@@            Coverage Diff            @@
##                2.x    #3020   +/-   ##
=========================================
  Coverage     94.38%   94.38%           
  Complexity     5313     5313           
=========================================
  Files           521      521           
  Lines         15144    15144           
  Branches       1005     1005           
=========================================
  Hits          14294    14294           
  Misses          804      804           
  Partials         46       46           
Flag Coverage Δ
sql-engine 94.38% <ø> (ø)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@penghuo penghuo merged commit a20f655 into 2.x Sep 17, 2024
37 of 39 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

dai-chen pushed a commit to dai-chen/sql-1 that referenced this pull request Oct 21, 2024
…nsearch-project#3020)

Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Peng Huo <[email protected]>
noCharger pushed a commit that referenced this pull request Oct 22, 2024
…) (#3090)

Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Peng Huo <[email protected]>
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.

3 participants