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

Update to Gradle 8.4 #2433

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Update to Gradle 8.4 #2433

merged 1 commit into from
Jan 24, 2024

Conversation

reta
Copy link
Contributor

@reta reta commented Nov 15, 2023

Description

Update to Gradle 8.4

Issues Resolved

Part of opensearch-project/OpenSearch#10334

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Copy link

codecov bot commented Nov 15, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (2c230be) 95.39% compared to head (0297e58) 95.39%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #2433   +/-   ##
=========================================
  Coverage     95.39%   95.39%           
  Complexity     4990     4990           
=========================================
  Files           478      478           
  Lines         13910    13910           
  Branches        932      932           
=========================================
  Hits          13270    13270           
  Misses          618      618           
  Partials         22       22           
Flag Coverage Δ
sql-engine 95.39% <ø> (ø)

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.

@reta reta force-pushed the gradle.8.4 branch 4 times, most recently from 8661a5d to 02b26dd Compare November 22, 2023 14:19
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta
Copy link
Contributor Author

reta commented Jan 17, 2024

Folks, anything holding off the merge here? Thank you.

@dai-chen
Copy link
Collaborator

I see another PR #2470. Are we targeting 8.4 or 8.5?

@reta
Copy link
Contributor Author

reta commented Jan 17, 2024

I mean this change is sitting 2 months in review, we could move to 8.5 after (but should be nobrainer)

@vmmusings
Copy link
Member

@dai-chen would you be able to re trigger CI checks?

@vmmusings
Copy link
Member

vmmusings commented Jan 17, 2024

somehow I couldn't trigger CI again. I just created a draft PR by cherry-picking the commit. We can follow the latest CI results here: #2472 . Once that is succesfull will close the draft and merge this PR.

@dai-chen
Copy link
Collaborator

same here. cannot rerun the failed CI...

@reta
Copy link
Contributor Author

reta commented Jan 17, 2024

same here. cannot rerun the failed CI...

Thanks @dai-chen The maintainers should be able to rerun the jobs , I am wondering why it is not the case for this repository ...

@vmmusings
Copy link
Member

There are build failures here: #2472
We need to understand them before merging this PR.

@reta
Copy link
Contributor Author

reta commented Jan 18, 2024

We need to understand them before merging this PR.

Sadly, the plugin has issues with stability of checks, there is not a single pull request that has checks passed [1], the same applies to main branch [2] commits :(

[1] https://github.com/opensearch-project/sql/pulls
[2] https://github.com/opensearch-project/sql/commits/main/

@vmmusings
Copy link
Member

vmmusings commented Jan 24, 2024

Pretty much all the bugs seems to be unrelated to this PR.
#2472 I tested with multiple fixes and still the CI is not working.
The fixes made till now are unrelated to the current PR and moreover the upgrade is necessary, so going ahead with the merge.

Thanks @reta . I think this upgrade is not required for 2.x

@vmmusings vmmusings self-assigned this Jan 24, 2024
@vmmusings vmmusings merged commit 6f30aea into opensearch-project:main Jan 24, 2024
20 of 22 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

reta added a commit to reta/sql that referenced this pull request Jan 25, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 6f30aea)
reta added a commit to reta/sql that referenced this pull request Jan 25, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 6f30aea)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit to reta/sql that referenced this pull request Jan 25, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 6f30aea)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
joshuali925 pushed a commit that referenced this pull request Jan 25, 2024
(cherry picked from commit 6f30aea)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
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.

5 participants