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.

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

Add --openjdk-target=x86_64-apple-darwin argument when crosscompiling jdk11+ (Mac) #3502

Merged
merged 1 commit into from
Oct 13, 2023

Conversation

Haroon-Khel
Copy link
Contributor

Moving the if statement outside of the jdk8 only code will ensure that the --openjdk-target=x86_64-apple-darwin config argument is added to the build command for all x64 jdks being built on arm64

related adoptium/ci-jenkins-pipelines#825 and #3492

@github-actions github-actions bot added macos Issues that affect or relate to the MAC OS arm Issues that affect or relate to the ARM OS cross-compile Issues that affect or relate to cross compiled platforms (e.g. RISC-V) jenkins Issues that enhance or fix our jenkins server labels Oct 13, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.

If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.

If the code freeze is over you can remove this block by commenting /thaw.

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you haven't already done so I suggest running the change here and to the pipeline code through a test as described in https://github.com/adoptium/ci-jenkins-pipelines/wiki/Building-your-own-branch-of-ci-jenkins-pipelines-or-temurin-build so they are tested together before this gets merged.

@Haroon-Khel
Copy link
Contributor Author

Haroon-Khel commented Oct 13, 2023

jdk11 x64 mac build on build-macstadium-macos11-arm64-1 https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk11u/job/jdk11u-mac-x64-temurin/305/console

--openjdk-target=x86_64-apple-darwin is added to the build args

@Haroon-Khel
Copy link
Contributor Author

Haroon-Khel commented Oct 13, 2023

jdk17 x64 mac build on build-macstadium-macos11-arm64-2 https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk17u/job/jdk17u-mac-x64-temurin/374/console

Again --openjdk-target=x86_64-apple-darwin is added to the build args

@Haroon-Khel
Copy link
Contributor Author

@Haroon-Khel
Copy link
Contributor Author

Haroon-Khel commented Oct 13, 2023

The jdk11 linux, 17 linux and 11 dragonwell workflow failures are no space left on device errors

@sxa
Copy link
Member

sxa commented Oct 13, 2023

The jdk11 linux, 17 linux and 11 dragonwell workflow failures are no space left on device errors

If this is happening consistently then we need an issue raised on it.

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Haroon-Khel
Copy link
Contributor Author

/merge

@github-actions
Copy link

Approval to merge during the lockdown cycle

Please can two Adoptium PMC members comment /approve?

@sxa
Copy link
Member

sxa commented Oct 13, 2023

/approve

1 similar comment
@andrew-m-leonard
Copy link
Contributor

/approve

@github-actions github-actions bot dismissed their stale review October 13, 2023 15:12

Thank you @sxa and @andrew-m-leonard for your approvals, this pull request is now approved to merge during release.

@Haroon-Khel Haroon-Khel merged commit b90ae95 into adoptium:master Oct 13, 2023
19 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
arm Issues that affect or relate to the ARM OS cross-compile Issues that affect or relate to cross compiled platforms (e.g. RISC-V) jenkins Issues that enhance or fix our jenkins server macos Issues that affect or relate to the MAC OS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants