opensearch-project / sql

Query your data using familiar SQL or intuitive Piped Processing Language (PPL)
https://opensearch.org/docs/latest/search-plugins/sql/index/
Apache License 2.0
120 stars 139 forks source link

[Backport 2.x] Upgrade org.bouncycastle:bcprov-jdk18on to 1.78.1 #3020

Closed opensearch-trigger-bot[bot] closed 2 months ago

opensearch-trigger-bot[bot] commented 2 months ago

Backport 25064688db2d08e61579aaf7d21ff440c67605a4 from #3004.

codecov[bot] commented 2 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

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 ```diff @@ 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](https://app.codecov.io/gh/opensearch-project/sql/pull/3020/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=opensearch-project) | Coverage Δ | | |---|---|---| | [sql-engine](https://app.codecov.io/gh/opensearch-project/sql/pull/3020/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=opensearch-project) | `94.38% <ø> (ø)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=opensearch-project#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

opensearch-trigger-bot[bot] commented 4 weeks ago

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.