From 1110956cf1456f2529dae028ddc26e6040edba8d Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 11 Sep 2023 17:01:09 +0100 Subject: [PATCH] Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard --- pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 3 +-- pipelines/jobs/configurations/jdk21_pipeline_config.groovy | 1 - pipelines/jobs/configurations/jdk22_pipeline_config.groovy | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index 12dad94db..28c0a517a 100644 --- 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 index 77022262e..4801b7d3e 100644 --- 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 index 5b5b8b572..188582d3f 100644 --- 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' ]