From 6b07390dfd9fff57d46e5c1758e2f953ec6b562b Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:18:16 +0100 Subject: [PATCH] Provide Windows SDK UCRT DLL paths for jdk17+ pipeline configuration (#811) * Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard * Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard * Add jdk17+ pipeline configuration for --with-ucrt-dll-dir location and version Signed-off-by: Andrew Leonard --------- Signed-off-by: Andrew Leonard --- pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 2 ++ pipelines/jobs/configurations/jdk21_pipeline_config.groovy | 1 + pipelines/jobs/configurations/jdk22_pipeline_config.groovy | 1 + 3 files changed, 4 insertions(+) diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index e12ee8250..28c0a517a 100644 --- 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 index b043602a2..4801b7d3e 100644 --- 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 index 3320e929b..188582d3f 100644 --- 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' ]