From 246bcec6977d0fcb408f7518eb5ae086fbeaf2c4 Mon Sep 17 00:00:00 2001
From: David Nestorovic <david.nestorovic@oracle.com>
Date: Wed, 25 Jan 2023 14:06:04 +0100
Subject: [PATCH] Change matrix to work with graalvm-jdk pairs and remove
 builds for JDK19

---
 .github/workflows/test-all-metadata.yml                     | 6 +++---
 .github/workflows/test-changed-metadata.yml                 | 6 +++---
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 .../src/main/groovy/org.graalvm.internal.tck-harness.gradle | 6 ++++--
 .../src/main/groovy/org.graalvm.internal.tck.gradle         | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-all-metadata.yml b/.github/workflows/test-all-metadata.yml
index f8237c323..b395a7afc 100644
--- a/.github/workflows/test-all-metadata.yml
+++ b/.github/workflows/test-all-metadata.yml
@@ -32,7 +32,7 @@ jobs:
           ./gradlew generateMatrixMatchingCoordinates -Pcoordinates=all
 
   test-all-metadata:
-    name: "🧪 ${{ matrix.coordinates }} (GraalVM ${{ matrix.version }} ${{ matrix.java-version }} @ ${{ matrix.os }})"
+    name: "🧪 ${{ matrix.coordinates }} (GraalVM ${{ matrix.versions.graalvm }} ${{ matrix.versions.java }} @ ${{ matrix.os }})"
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     needs: get-all-metadata
@@ -45,8 +45,8 @@ jobs:
       - name: "🔧 Prepare environment"
         uses: graalvm/setup-graalvm@v1
         with:
-          version: ${{ matrix.version }}
-          java-version: ${{ matrix.java-version }}
+          version: ${{ matrix.versions.graalvm }}
+          java-version: ${{ matrix.versions.java }}
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: 'true'
diff --git a/.github/workflows/test-changed-metadata.yml b/.github/workflows/test-changed-metadata.yml
index 028ec9571..9be92bee0 100644
--- a/.github/workflows/test-changed-metadata.yml
+++ b/.github/workflows/test-changed-metadata.yml
@@ -34,7 +34,7 @@ jobs:
           ./gradlew generateMatrixDiffCoordinates -PbaseCommit=${{ github.event.pull_request.base.sha }} -PnewCommit=${{ github.event.pull_request.head.sha }}
 
   test-changed-metadata:
-    name: "🧪 ${{ matrix.coordinates }} (GraalVM ${{ matrix.version }} ${{ matrix.java-version }} @ ${{ matrix.os }})"
+    name: "🧪 ${{ matrix.coordinates }} (GraalVM ${{ matrix.versions.graalvm }} ${{ matrix.versions.java }} @ ${{ matrix.os }})"
     if: needs.get-changed-metadata.result == 'success' && needs.get-changed-metadata.outputs.none-found != 'true'
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
@@ -49,8 +49,8 @@ jobs:
       - name: "🔧 Prepare environment"
         uses: graalvm/setup-graalvm@v1
         with:
-          version: ${{ matrix.version }}
-          java-version: ${{ matrix.java-version }}
+          version: ${{ matrix.versions.graalvm }}
+          java-version: ${{ matrix.versions.java }}
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: 'true'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e33edef..070cb702f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle
index 1cd7e344b..1b4826ca9 100644
--- a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle
+++ b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle
@@ -86,8 +86,10 @@ if (project.hasProperty("baseCommit")) {
 }
 
 def matrixDefault = [
-        "version"     : ["22.3.0", "dev"], // TODO: Add other supported versions
-        "java-version": ["17"], // TODO: Add "17", "19"
+        "versions" : [
+//                [ "graalvm": "dev", "java": "dev" ], // TODO: uncomment this once we are ready to run tests on JDK19
+                [ "graalvm": "latest", "java": "17"]
+        ],
         "os"          : ["ubuntu-latest"] // TODO: Add support for "windows-latest", "macos-latest"
 ]
 
diff --git a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle
index aa6c67c00..5d3717bba 100644
--- a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle
+++ b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle
@@ -19,7 +19,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(JavaVersion.current().majorVersion)
         vendor = JvmVendorSpec.GRAAL_VM
     }
 }