diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5843778..bc75c61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 19 ] + java: [ 17 ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index c6a63a5..b84506b 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -21,16 +21,16 @@ jobs: dockerfile: - Dockerfile.ci - Dockerfile.openj9.ci - # - Dockerfile.graalvm-jvm.ci + - Dockerfile.graalvm-jvm.ci fail-fast: false steps: - uses: actions/checkout@v3 - name: Create Version File run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION - - name: set up JDK 19 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 19 + java-version: 17 distribution: temurin cache: "gradle" - name: Run Build diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index f1c69ef..cf385b3 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -17,16 +17,16 @@ jobs: dockerfile: ./Dockerfile.openj9.ci - image: 1337kavin/piped:latest,1337kavin/piped:hotspot dockerfile: ./Dockerfile.ci - # - image: 1337kavin/piped:graalvm-jvm - # dockerfile: ./Dockerfile.graalvm-jvm.ci + - image: 1337kavin/piped:graalvm-jvm + dockerfile: ./Dockerfile.graalvm-jvm.ci steps: - uses: actions/checkout@v3 - name: Create Version File run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION - - name: set up JDK 19 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 19 + java-version: 17 distribution: temurin cache: "gradle" - name: Run Build diff --git a/Dockerfile b/Dockerfile index bba2bc5..3f08682 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:19-jdk AS build +FROM eclipse-temurin:17-jdk AS build WORKDIR /app/ @@ -7,7 +7,7 @@ COPY . /app/ RUN --mount=type=cache,target=/root/.gradle/caches/ \ ./gradlew shadowJar -FROM eclipse-temurin:19-jre +FROM eclipse-temurin:17-jre WORKDIR /app/ diff --git a/Dockerfile.ci b/Dockerfile.ci index 281b997..8dd60e5 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM eclipse-temurin:19-jre +FROM eclipse-temurin:17-jre WORKDIR /app/ diff --git a/Dockerfile.openj9 b/Dockerfile.openj9 index 3af0060..cbc1b23 100644 --- a/Dockerfile.openj9 +++ b/Dockerfile.openj9 @@ -1,4 +1,4 @@ -FROM 1337kavin/openj9-19 AS build +FROM ibm-semeru-runtimes:open-17-jdk AS build WORKDIR /app/ @@ -7,7 +7,7 @@ COPY . /app/ RUN --mount=type=cache,target=/root/.gradle/caches/ \ ./gradlew shadowJar -FROM 1337kavin/openj9-19:latest-jre +FROM ibm-semeru-runtimes:open-17-jre WORKDIR /app/ diff --git a/Dockerfile.openj9.ci b/Dockerfile.openj9.ci index 2fe02e8..c7bb652 100644 --- a/Dockerfile.openj9.ci +++ b/Dockerfile.openj9.ci @@ -1,4 +1,4 @@ -FROM 1337kavin/openj9-19:latest-jre +FROM ibm-semeru-runtimes:open-17-jre WORKDIR /app/ diff --git a/build.gradle b/build.gradle index 80c4d70..e290452 100644 --- a/build.gradle +++ b/build.gradle @@ -62,5 +62,5 @@ tasks.withType(JavaCompile).each { group = 'me.kavin.piped' version = '1.0' -sourceCompatibility = JavaVersion.VERSION_19 -targetCompatibility = JavaVersion.VERSION_19 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17