summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2023-03-25 21:06:13 +0000
committerFabian Mastenbroek <mail.fabianm@gmail.com>2023-03-25 21:49:35 +0000
commita94610b3954cb2368fff789db668129d6ae6a339 (patch)
tree3446c3eeb7cfb415fd68eae4329889a84d0b5868
parent9dee97a3675d6787db934846cfe338c0c4f81056 (diff)
ci: Test OpenDC on Java 20
This change updates the CI pipeline so that Java 20 is being tested with the latest Gradle RC, since Gradle 8.0 does not support it yet.
-rw-r--r--.github/workflows/test-gradle-rc.yml2
-rw-r--r--.github/workflows/test-java-ea.yml2
-rw-r--r--opendc-web/opendc-web-runner/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/test-gradle-rc.yml b/.github/workflows/test-gradle-rc.yml
index a3513bfa..c6aa6784 100644
--- a/.github/workflows/test-gradle-rc.yml
+++ b/.github/workflows/test-gradle-rc.yml
@@ -11,7 +11,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 19
+ java-version: 20
- uses: gradle/gradle-build-action@v2
with:
cache-disabled: true
diff --git a/.github/workflows/test-java-ea.yml b/.github/workflows/test-java-ea.yml
index 40927ffc..7dc2671f 100644
--- a/.github/workflows/test-java-ea.yml
+++ b/.github/workflows/test-java-ea.yml
@@ -11,7 +11,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 20-ea
+ java-version: 21-ea
- uses: gradle/gradle-build-action@v2
with:
cache-disabled: true
diff --git a/opendc-web/opendc-web-runner/Dockerfile b/opendc-web/opendc-web-runner/Dockerfile
index 5dcc3b9c..3f393055 100644
--- a/opendc-web/opendc-web-runner/Dockerfile
+++ b/opendc-web/opendc-web-runner/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:18-slim
+FROM openjdk:17-slim
MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com>
# Obtain (cache) Gradle wrapper