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

Fix Windows Mandrel build for graal/master #380

Merged
merged 1 commit into from
Nov 21, 2023

Conversation

jerboaa
Copy link
Collaborator

@jerboaa jerboaa commented Nov 20, 2023

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Nov 20, 2023
@jerboaa jerboaa changed the title WIP: Attempt to fix Windows build Fix Windows Mandrel build for graal/master Nov 20, 2023
@jerboaa
Copy link
Collaborator Author

jerboaa commented Nov 20, 2023

MacOS GHA build fail is tracked here: #382

@jerboaa
Copy link
Collaborator Author

jerboaa commented Nov 20, 2023

oracle/graal#7557 is the upstream change that makes this change needed for graal/master.

@jerboaa
Copy link
Collaborator Author

jerboaa commented Nov 20, 2023

Full mandrel CI test run with this for Windows is here: https://github.com/graalvm/mandrel/actions/runs/6931873655

Copy link
Collaborator

@zakkak zakkak left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @jerboaa.

Nice to have: Could you please add an if-exists before the copy to make sure we can build commits before the change as well?

@jerboaa
Copy link
Collaborator Author

jerboaa commented Nov 20, 2023

Nice to have: Could you please add an if-exists before the copy to make sure we can build commits before the change as well?

Is this really needed? Not sure what the use-case would be... Would you have an example? mandrel-packaging in the master config builds 24.0 currently. We are going to branch for 24.1 and have separate branches for older releases. What am I missing?

@zakkak
Copy link
Collaborator

zakkak commented Nov 21, 2023

The only use case is when debugging/git-bisecting, i.e. if we want to build an older version of 24.0-dev. In that case it would be nice if we didn't have to checkout a different mandrel-packaging version. Certainly not a priority or blocker.

@jerboaa
Copy link
Collaborator Author

jerboaa commented Nov 21, 2023

Certainly not a priority or blocker.

I'll merge as is, if OK. As you can guess I'm not a fan of first-check-if-exists-then-do-something flow. It's expected to be there and the chance of doing bisect on Windows are minimal? Hope that's fine.

@jerboaa jerboaa merged commit 26d8acf into graalvm:master Nov 21, 2023
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GraalVM master tree fails to build Mandrel with JDK 22 EA on Windows
2 participants