Provide Windows SDK UCRT DLL paths for jdk17+ pipeline configuration (a…

…doptium#811) * Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard <[email protected]> * Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard <[email protected]> * Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard <[email protected]> --------- Signed-off-by: Andrew Leonard <[email protected]>
luhenry · Feb 3, 2024 · 6b07390 · 6b07390
1 parent 80c904b
commit 6b07390
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -74,6 +74,7 @@ class Config17 {
                 reproducibleCompare : [
                         'temurin'   : true
                 ],
+                configureArgs       : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x64'",
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
                 ]
@@ -84,6 +85,7 @@ class Config17 {
                 arch                : 'x86-32',
                 additionalNodeLabels: 'win2022&&vs2019',
                 test                : 'default',
+                configureArgs       : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x86'",
                 buildArgs           : [
                         'temurin'   : '--jvm-variant client,server --create-jre-image --create-sbom'
                 ]

diff --git a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
@@ -71,6 +71,7 @@ class Config21 {
                 reproducibleCompare : [
                         'temurin'   : true
                 ],
+                configureArgs       : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x64'",
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
                 ]

diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -62,6 +62,7 @@ class Config22 {
                 arch                : 'x64',
                 additionalNodeLabels: 'win2022&&vs2019',
                 test                : 'default',
+                configureArgs       : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x64'",
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
                 ]