User: rednesto
Date: 13 Aug 24 16:44
Revision: 5ffeb7539260d8798747443b5fe357749ddcfec1
Summary:
Look for JDK using the setup-java env variable too


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9608&personal=false

Index: .github/workflows/test.yml
===================================================================
--- .github/workflows/test.yml	(revision 67896da1d981afc636558a351bb9cbc512972bb7)
+++ .github/workflows/test.yml	(revision 5ffeb7539260d8798747443b5fe357749ddcfec1)
@@ -23,6 +23,7 @@
           java-version: |
             11
             17
+            21
       - uses: actions/cache@v3
         with:
           path: |
Index: src/test/kotlin/framework/GradleImportTest.kt
===================================================================
--- src/test/kotlin/framework/GradleImportTest.kt	(revision 67896da1d981afc636558a351bb9cbc512972bb7)
+++ src/test/kotlin/framework/GradleImportTest.kt	(revision 5ffeb7539260d8798747443b5fe357749ddcfec1)
@@ -30,6 +30,7 @@
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.modules
 import com.intellij.openapi.projectRoots.JavaSdk
+import com.intellij.openapi.projectRoots.JavaSdkVersion
 import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.projectRoots.ex.JavaSdkUtil
 import com.intellij.openapi.roots.ProjectRootManager
@@ -71,10 +72,13 @@
         super.setUp()
 
         runWriteTask {
-            val jdk21Home = System.getenv("JDK_21_0") ?: System.getenv("JDK_21") ?: System.getenv("JDK21")
+            val envNames = setOf("JDK_21_0", "JDK_21", "JDK21", "JAVA_HOME_21_x64")
+            val jdk21Home = envNames.firstNotNullOfOrNull(System::getenv)
             assertNotNull("Could not find JDK 21 home", jdk21Home)
 
-            val jdk = JavaSdk.getInstance().createJdk("JDK 21", jdk21Home, false)
+            val jdk = JavaSdk.getInstance().createJdk("JDK 21", jdk21Home!!, false)
+            assertEquals(JavaSdkVersion.JDK_21, JavaSdk.getInstance().getVersion(jdk))
+
             ProjectJdkTable.getInstance().addJdk(jdk)
             JavaSdkUtil.applyJdkToProject(myProject, jdk)
         }