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

[Release 3.0] Update gradle to 8.10.2 for JDK23 and codecov to v5 and fix delete backport branches #1157

Merged

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Jan 31, 2025

Description

[Release 3.0] Update gradle to 8.10.2 for JDK23 and codecov to v5 and fix delete backport branches

Related Issues

Closes #1156

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@peterzhuamazon peterzhuamazon changed the title Update gradle to 8.10.2 for JDK23 and codecov to v5 [Release 3.0] Update gradle to 8.10.2 for JDK23 and codecov to v5 Jan 31, 2025
@peterzhuamazon
Copy link
Member Author

peterzhuamazon commented Jan 31, 2025

Hi @martin-gaievski @heemin32 this PR might fail due to main have to go to lucene 10 as lucene9 has moved place already:

* What went wrong:
Execution failed for task ':compileJava'.
> Could not resolve all dependencies for configuration ':compileClasspath'.
   > Conflict found for the following module:
       - org.apache.lucene:lucene-core between versions 9.12.1 and 9.12.0

The fix will go through @martin-gaievski PR here:

Once this PR is merged you can rebase to your branch.

Thanks!

Signed-off-by: Peter Zhu <[email protected]>
Copy link

codecov bot commented Jan 31, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.72%. Comparing base (558da1f) to head (f20e321).
Report is 2 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1157      +/-   ##
============================================
+ Coverage     81.58%   81.72%   +0.14%     
- Complexity     1246     1247       +1     
============================================
  Files            93       93              
  Lines          4213     4213              
  Branches        714      714              
============================================
+ Hits           3437     3443       +6     
+ Misses          507      500       -7     
- Partials        269      270       +1     

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

Signed-off-by: Peter Zhu <[email protected]>
@peterzhuamazon
Copy link
Member Author

peterzhuamazon commented Jan 31, 2025

Update:

  • Add jacoco task
  • Move jacoco report xml to root location
  • Upload jacoco xml specifically with new v5 codecov.
  • Fix delete backport branch failure issues

Thanks.

@peterzhuamazon peterzhuamazon changed the title [Release 3.0] Update gradle to 8.10.2 for JDK23 and codecov to v5 [Release 3.0] Update gradle to 8.10.2 for JDK23 and codecov to v5 and fix delete backport branches Jan 31, 2025
Signed-off-by: Peter Zhu <[email protected]>
@peterzhuamazon
Copy link
Member Author

Hi @martin-gaievski @heemin32 can we go ahead and merge this?

Thanks.

@heemin32 heemin32 merged commit 23ecabc into opensearch-project:main Feb 3, 2025
27 of 75 checks passed
@peterzhuamazon peterzhuamazon deleted the resolve-codecov-tokens branch February 3, 2025 18:19
weijia-aws pushed a commit to weijia-aws/neural-search that referenced this pull request Feb 4, 2025
… fix delete backport branches (opensearch-project#1157)

* Update gradle to 8.10.2 for JDK23 and codecov to v5

Signed-off-by: Peter Zhu <[email protected]>

* Update to all

Signed-off-by: Peter Zhu <[email protected]>

* Update so that only x64 will upload test coverage

Signed-off-by: Peter Zhu <[email protected]>

* More tweaks

Signed-off-by: Peter Zhu <[email protected]>

* Fix delete backport branch and update jacoco

Signed-off-by: Peter Zhu <[email protected]>

* Update codecov logics

Signed-off-by: Peter Zhu <[email protected]>

* Update codecov logics

Signed-off-by: Peter Zhu <[email protected]>

---------

Signed-off-by: Peter Zhu <[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.

Bump gradle to 8.10.2 and add JDK23 as part of the github checks
3 participants