From 4eeb3ce460ea920cadffe6656830a4f62b6e10ca Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 11 Sep 2023 16:09:23 +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 | 2 ++ pipelines/jobs/configurations/jdk22_pipeline_config.groovy | 2 ++ 3 files changed, 7 insertions(+) diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index e12ee8250..0acf48811 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/x64"', buildArgs : [ 'temurin' : '--jvm-variant client,server --create-jre-image --create-sbom' ] @@ -186,6 +188,7 @@ 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 b043602a2..ebb027cac 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' ] @@ -178,6 +179,7 @@ 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 3320e929b..93495300c 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' ] @@ -157,6 +158,7 @@ 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' ]