Add deps.windows_devkit in ci/common.jsonnet

Author: eregon

ci/common.jsonnet

@@ -109,7 +109,8 @@ local common_json = import "../common.json";
     oraclejdkLatest: self["oraclejdk-latest"],
   },
 
-  # The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)
+  # The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js).
+  # See deps.windows_devkit to add a devkit on windows conveniently.
   devkits: {
     "windows-jdk17": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
     "windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
@@ -174,6 +175,12 @@ local common_json = import "../common.json";
 
     # These dependencies are not included by default in any platform object
 
+    # Not included by default in $.windows_amd64 and $.windows_server_2016_amd64 because it needs jdk_name.
+    # As a note, Native Image needs this to build.
+    windows_devkit:: {
+      packages+: if self.os == "windows" then $.devkits["windows-" + self.jdk_name].packages else {},
+    },
+
     eclipse: {
       downloads+: {
         ECLIPSE: {

sulong/ci/ci_common/sulong-common.jsonnet

@@ -80,10 +80,7 @@ local sulong_deps = common.deps.sulong;
   linux_aarch64:: linux_aarch64 + sulong_deps,
   darwin_amd64:: darwin_amd64 + sulong_deps,
   darwin_aarch64:: darwin_aarch64 + sulong_deps,
-  windows_amd64:: windows_amd64 + sulong_deps + {
-    local jdk = if self.jdk_name == "jdk-latest" then "jdkLatest" else self.jdk_name,
-    packages+: common.devkits["windows-" + jdk].packages
-  },
+  windows_amd64:: windows_amd64 + sulong_deps + common.deps.windows_devkit,
 
   sulong_notifications:: {
     notify_groups:: ["sulong"],

tools/ci/ci.jsonnet

@@ -2,7 +2,6 @@
   local common = import '../../ci/ci_common/common.jsonnet',
   local utils = import '../../ci/ci_common/common-utils.libsonnet',
   local top_level_ci = utils.top_level_ci,
-  local devkits = common.devkits,
 
   local tools_common = {
     setup+: [
@@ -90,8 +89,8 @@
     common.linux_aarch64 + common.labsjdkLatest   + tools_weekly,
     common.linux_aarch64 + common.labsjdk21   + tools_weekly,
 
-    common.windows_amd64 + common.oraclejdkLatest + tools_weekly + devkits["windows-jdkLatest"],
-    common.windows_amd64 + common.oraclejdk21 + tools_weekly + devkits["windows-jdk21"],
+    common.windows_amd64 + common.oraclejdkLatest + tools_weekly + common.deps.windows_devkit,
+    common.windows_amd64 + common.oraclejdk21 + tools_weekly + common.deps.windows_devkit,
 
     common.darwin_amd64  + common.oraclejdkLatest + tools_weekly,
     common.darwin_amd64  + common.oraclejdk21 + tools_weekly,