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

update macOS labels to pin XCode version #843

Merged
merged 1 commit into from
Nov 17, 2023
Merged

update macOS labels to pin XCode version #843

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
2 changes: 0 additions & 2 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 @@ -4,7 +4,6 @@ class Config11 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos11',
test : 'default',
configureArgs : [
'openj9' : '--enable-dtrace=auto --with-cmake',
Expand Down Expand Up @@ -137,7 +136,6 @@ class Config11 {
aarch64Mac: [
os : 'mac',
arch : 'aarch64',
additionalNodeLabels: 'macos11',
test : 'default',
configureArgs : '--disable-ccache',
buildArgs : [
Expand Down
4 changes: 2 additions & 2 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 @@ -4,7 +4,7 @@ class Config17 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'macos11',
additionalNodeLabels: 'xcode12.4',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
],
Expand Down Expand Up @@ -148,7 +148,7 @@ class Config17 {
aarch64Mac: [
os : 'mac',
arch : 'aarch64',
additionalNodeLabels: 'macos11',
additionalNodeLabels: 'xcode12.4',
test : 'default',
reproducibleCompare : [
'temurin' : true
Expand Down
4 changes: 2 additions & 2 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 @@ -4,7 +4,7 @@ class Config21 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'macos11',
additionalNodeLabels: 'xcode12.4',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
],
Expand Down Expand Up @@ -140,7 +140,7 @@ class Config21 {
aarch64Mac: [
os : 'mac',
arch : 'aarch64',
additionalNodeLabels: 'macos11',
additionalNodeLabels: 'xcode12.4',
test : 'default',
reproducibleCompare : [
'temurin' : true
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk22_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Config22 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'macos11',
additionalNodeLabels: 'xcode12.4',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
],
Expand Down Expand Up @@ -122,7 +122,7 @@ class Config22 {
aarch64Mac: [
os : 'mac',
arch : 'aarch64',
additionalNodeLabels: 'macos11',
additionalNodeLabels: 'xcode12.4',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
3 changes: 1 addition & 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 @@ -5,8 +5,7 @@ class Config8 {
os : 'mac',
arch : 'x64',
additionalNodeLabels: [
temurin : 'macos11',
corretto: 'build-macstadium-macos1010-1',
temurin : 'xcode11.7',
openj9 : 'macos10.14'
],
test : 'default',
Expand Down