Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable temurin vs2022_redist_14.40.33807_10.0.26100.0 latest devkit #1123

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Enable temurin vs2022_redist_14.40.33807_10.0.26100.0 latest devkit #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Config11 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom'
'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
],
test : 'default'
],
Expand All @@ -92,7 +92,7 @@ class Config11 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom'
'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
],
test : 'default'
],
Expand Down Expand Up @@ -253,7 +253,7 @@ class Config11 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom --cross-compile'
'temurin' : '--jvm-variant client,server --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
]
]
Expand Down
8 changes: 3 additions & 5 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ class Config17 {
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'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
],

Expand All @@ -81,9 +80,8 @@ 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'
'temurin' : '--jvm-variant client,server --create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
],

Expand Down Expand Up @@ -182,7 +180,7 @@ class Config17 {
additionalNodeLabels: 'win2022&&vs2019',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
]
]
Expand Down
5 changes: 2 additions & 3 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ class Config21 {
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system']
],
configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'",
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
],

Expand Down Expand Up @@ -164,7 +163,7 @@ class Config21 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
]
]
Expand Down
5 changes: 2 additions & 3 deletions pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ class Config23 {
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system']
],
configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'",
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
],

Expand Down Expand Up @@ -165,7 +164,7 @@ class Config23 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
]
]
Expand Down
5 changes: 2 additions & 3 deletions pipelines/jobs/configurations/jdk24_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ class Config24 {
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system']
],
configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'",
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
],

Expand Down Expand Up @@ -165,7 +164,7 @@ class Config24 {
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
]
]
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Config8 {
'temurin' : '--disable-ccache'
],
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
]
],

Expand All @@ -86,7 +86,7 @@ class Config8 {
'temurin' : '--disable-ccache'
],
buildArgs : [
temurin : '--jvm-variant client,server --create-sbom'
temurin : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
],
test : 'default'
],
Expand Down