Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location an…

…d version Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Sep 11, 2023 · 1110956 · 1110956
1 parent 12dbbcb
commit 1110956
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -85,7 +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/x64'",
+                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'
                 ]
@@ -188,7 +188,6 @@ class Config17 {
                 crossCompile        : '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 --cross-compile'
                 ]

diff --git a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
@@ -179,7 +179,6 @@ class Config21 {
                 crossCompile        : '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 --cross-compile'
                 ]

diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -158,7 +158,6 @@ class Config22 {
                 crossCompile        : '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 --cross-compile'
                 ]