From 9209d59af2189befbc3cd76395a8f62d5955b4d5 Mon Sep 17 00:00:00 2001 From: Kingston Chan Date: Mon, 25 Jan 2021 17:21:10 +0900 Subject: [PATCH 1/4] Update Graalvm docker repository & build version --- .../packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala | 2 +- src/sbt-test/graalvm-native-image/docker-native-image/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala b/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala index 78d5f6523..1d66daeb9 100644 --- a/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala +++ b/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala @@ -27,7 +27,7 @@ object GraalVMNativeImagePlugin extends AutoPlugin { import autoImport._ - private val GraalVMBaseImage = "oracle/graalvm-ce" + private val GraalVMBaseImage = "ghcr.io/graalvm/graalvm-ce" override def requires: Plugins = JavaAppPackaging diff --git a/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt b/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt index ee4ef3c72..cf748f3c5 100644 --- a/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt +++ b/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt @@ -2,4 +2,4 @@ enablePlugins(GraalVMNativeImagePlugin) name := "docker-test" version := "0.1.0" -graalVMNativeImageGraalVersion := Some("19.0.0") \ No newline at end of file +graalVMNativeImageGraalVersion := Some("21.0.0") \ No newline at end of file From 055ead8ab0dab38467a80e33112aba8cde7674f1 Mon Sep 17 00:00:00 2001 From: Kingston Chan Date: Tue, 26 Jan 2021 13:57:08 +0900 Subject: [PATCH 2/4] Update Github action Java base for Graalvm test to Graalvm v21.0.0 --- .github/workflows/validate-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index f03afa1bb..134260f80 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -258,7 +258,7 @@ jobs: - name: Setup GraalVM environment uses: olafurpg/setup-scala@v10 with: - java-version: graalvm@19.0.0 + java-version: graalvm@21.0.0 - name: Install native-image run: gu install native-image - name: Validate From 1e86416451145f5a55c2e6ff261b48a87b2f1871 Mon Sep 17 00:00:00 2001 From: Nepomuk Seiler Date: Tue, 26 Jan 2021 12:29:44 +0100 Subject: [PATCH 3/4] Use latest available version of graalvm --- .github/workflows/validate-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 134260f80..c94de85df 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -258,7 +258,7 @@ jobs: - name: Setup GraalVM environment uses: olafurpg/setup-scala@v10 with: - java-version: graalvm@21.0.0 + java-version: graalvm@20.3.0 - name: Install native-image run: gu install native-image - name: Validate From d459f8576cd77a1d77d14bb67cbed51be5772039 Mon Sep 17 00:00:00 2001 From: Kingston Chan Date: Thu, 25 Feb 2021 14:37:36 +0900 Subject: [PATCH 4/4] Update .github/workflows/validate-pr.yml --- .github/workflows/validate-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index c94de85df..134260f80 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -258,7 +258,7 @@ jobs: - name: Setup GraalVM environment uses: olafurpg/setup-scala@v10 with: - java-version: graalvm@20.3.0 + java-version: graalvm@21.0.0 - name: Install native-image run: gu install native-image - name: Validate