From 3162193cdee747ad4094f4669b83ef2d575e90d1 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 26 Apr 2024 16:58:13 -0500 Subject: [PATCH 1/2] build: pin java17 tests to 1.20.4 --- .github/workflows/build-multiarch.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 24db10d4664..9b6f1b8c86c 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -52,23 +52,23 @@ jobs: # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 baseImage: eclipse-temurin:17-jre-focal platforms: linux/amd64,linux/arm/v7,linux/arm64 - mcVersion: latest + mcVersion: 1.20.4 - variant: java17-graalvm baseImage: container-registry.oracle.com/graalvm/jdk:17-ol8 platforms: linux/amd64,linux/arm64 - mcVersion: latest + mcVersion: 1.20.4 - variant: java17-jdk baseImage: eclipse-temurin:17-focal platforms: linux/amd64,linux/arm/v7,linux/arm64 - mcVersion: latest + mcVersion: 1.20.4 - variant: java17-openj9 baseImage: ibm-semeru-runtimes:open-17-jre platforms: linux/amd64,linux/arm64 - mcVersion: latest + mcVersion: 1.20.4 - variant: java17-alpine baseImage: eclipse-temurin:17-jre-alpine platforms: linux/amd64 - mcVersion: latest + mcVersion: 1.20.4 # JAVA 11: - variant: java11 baseImage: adoptopenjdk:11-jre-hotspot From b7fb235fb1d11d52b9bc44d998d0ebc210695bc6 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 26 Apr 2024 16:58:45 -0500 Subject: [PATCH 2/2] Update verify-pr.yml --- .github/workflows/verify-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index 91cb18e6086..34a62a01b05 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -36,7 +36,7 @@ jobs: # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 baseImage: eclipse-temurin:17-jre-focal platforms: linux/amd64 - mcVersion: latest + mcVersion: 1.20.4 - variant: java8 baseImage: eclipse-temurin:8u312-b07-jre-focal platforms: linux/amd64