Specify jdkHome for builds where it was missing

ktorio · Dec 6, 2024 · 47ecac5 · 47ecac5
1 parent 304f99b
commit 47ecac5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.teamcity/src/subprojects/build/core/JavaScriptBuild.kt b/.teamcity/src/subprojects/build/core/JavaScriptBuild.kt
@@ -23,6 +23,7 @@ class JavaScriptBuild(private val jsEntry: JSEntry) : BuildType({
         gradle {
             name = "Build Js"
             tasks = "cleanJsTest jsTest --no-parallel --continue --info -Penable-js-tests"
+            jdkHome = Env.JDK_LTS
             setupDockerForJavaScriptTests(jsEntry)
         }
     }

diff --git a/.teamcity/src/subprojects/build/core/WasmJsBuild.kt b/.teamcity/src/subprojects/build/core/WasmJsBuild.kt
@@ -23,6 +23,7 @@ class WasmJsBuild(private val jsEntry: JSEntry) : BuildType({
         gradle {
             name = "Build Wasm Js"
             tasks = "cleanWasmJsTest wasmJsTest --no-parallel --continue --info -Penable-js-tests"
+            jdkHome = Env.JDK_LTS
             setupDockerForJavaScriptTests(jsEntry)
         }
     }

diff --git a/.teamcity/src/subprojects/plugins/ProjectGradlePlugin.kt b/.teamcity/src/subprojects/plugins/ProjectGradlePlugin.kt
@@ -31,6 +31,7 @@ object ProjectGradlePlugin : Project({
                 name = "Publish"
                 tasks = ":plugin:publishPlugins"
                 gradleParams = "-PversionSuffix=eap-%build.counter%"
+                jdkHome = Env.JDK_LTS
             }
         }
     }
@@ -47,6 +48,7 @@ object ProjectGradlePlugin : Project({
             gradle {
                 name = "Publish"
                 tasks = ":plugin:publishPlugins"
+                jdkHome = Env.JDK_LTS
             }
         }
     }
@@ -64,6 +66,7 @@ object ProjectGradlePlugin : Project({
                 name = "Publish"
                 tasks = ":plugin:publishPlugins"
                 gradleParams = "-PversionSuffix=beta-%build.counter%"
+                jdkHome = Env.JDK_LTS
             }
         }
     }
@@ -86,6 +89,7 @@ object ProjectGradlePlugin : Project({
                 name = "Publish to Space Packages"
                 tasks = ":plugin:publish"
                 gradleParams = "-Pspace -PversionSuffix=eap-%build.counter%"
+                jdkHome = Env.JDK_LTS
             }
         }
     }
@@ -110,6 +114,7 @@ object ProjectGradlePlugin : Project({
             gradle {
                 name = "Run tests"
                 tasks = ":plugin:test test"
+                jdkHome = Env.JDK_LTS
             }
         }
     }