Update Gradle to 8.10 #1140
Update Gradle to 8.10 #1140
Conversation
reta
requested review from
Bukhtawar,
dblock,
szczepanczykd,
madhusudhankonda,
saratvemulapalli,
VachaShah and
Xtansia
as code owners
reta
added
backport 2.x
|
The unreleased opensearch version integ tests need a different JDK like in opensearch-project/opensearch-py#798, want to fix it here? Also the backport workflow seems off. |
Signed-off-by: Andriy Redko <[email protected]>
Sure, thanks @dblock
Ah, that's like that: label should be after the merge |
Should probably not run on non-merged PRs then? |
| @@ -48,10 +48,22 @@ jobs: | |||
| path: opensearch/distribution/archives/linux-tar/build/distributions | |||
| key: ${{ steps.get-key.outputs.key }} | |||
|
|
|||
| - name: Set up JDK 17 | |||
There was a problem hiding this comment.
This is fine, but maybe a cleaner/simpler implementation adds a java-runtime to the matrix above.
There was a problem hiding this comment.
So we need 2 JDKs to be installed in case of 11: 11 + 17, and only one in all other cases. Adding java-runtime would lead to duplicate actions/setup-java@v4 runs, isn't it?
There was a problem hiding this comment.
Like this:
matrix:
entry:
- { opensearch_ref: '1.x', java: 11 }
- { opensearch_ref: '2.x', java: 11, java-runtime: 17 }
- { opensearch_ref: '2.x', java: 17 }
- { opensearch_ref: '2.x', java: 21 }
- { opensearch_ref: 'main', java: 11, java-runtime: 17 }
- { opensearch_ref: 'main', java: 17 }
- { opensearch_ref: 'main', java: 21 }
Then below you do if: matrix.java-runtime and java-version: ${{ matrix.java-runtime }}.
This makes the intent very clear.
There was a problem hiding this comment.
But you still need this if statement :( Let me try, one sec
There was a problem hiding this comment.
Looks better @dblock ?
That's why it fails with the message that it should be added on merged prs |
Signed-off-by: Andriy Redko <[email protected]>
* Update Gradle to 8.10 Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit 7d894d6) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Update Gradle to 8.10 * Address code review comments --------- (cherry picked from commit 7d894d6) Signed-off-by: Andriy Redko <[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>
Description
Update Gradle to 8.10
Issues Resolved
N/A_
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.