Skip to content

Commit

Permalink
Gradle doesn't recognize pre-installed java 21, so using java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
mr-serjey committed May 28, 2024
1 parent 708ac6c commit f3153bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- java: 8
gradle: '6.9.4'
container: "['jetty9.3','jetty9.4','tomcat85','tomcat9']"
toolchainJavaVersion: 21
toolchainJavaVersion: 17

- java: 11
gradle: '6.9.4'
Expand All @@ -61,7 +61,7 @@ jobs:
- java: 11
gradle: '6.9.4'
container: "['jetty9.3','jetty9.4','jetty10','tomcat85','tomcat9']"
toolchainJavaVersion: 21
toolchainJavaVersion: 17

- java: 17
gradle: '7.6.4'
Expand Down
4 changes: 2 additions & 2 deletions docker_integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ export common_gradle_args="--console=plain --no-daemon -Porg.gradle.java.install

#ci.yml matrix case #1 + toolchain java v21
./docker_gradlew.sh \
--java 21 --java 8 \
--java 17 --java 8 \
--gradle 6 \
--gradle-home .docker-gradle \
--working-dir integrationTests \
$common_gradle_args \
-PtestAllContainers="\"['jetty9.3','jetty9.4','tomcat85','tomcat9']\"" \
-PtoolchainJavaVersion=21 \
-PtoolchainJavaVersion=17 \
testAllJavaToolchain

#ci.yml matrix case #2 + toolchain java v17
Expand Down

0 comments on commit f3153bd

Please sign in to comment.