Skip to content

[24.2] Merge upstream release/graal-vm/24.2 branch into mandrel/24.2 #858

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

Open
wants to merge 2 commits into
base: mandrel/24.2
Choose a base branch
from

Conversation

jerboaa
Copy link
Collaborator

@jerboaa jerboaa commented Jun 17, 2025

Just a version bump from upstream and building with latest JDK 24/ea.

@jerboaa jerboaa requested review from Karm and zakkak June 17, 2025 15:16
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jun 17, 2025
@zakkak
Copy link
Collaborator

zakkak commented Jun 17, 2025

@jerboaa something looks strange in this PR, I don't see which commit is responsible for the ga -> ea change in the pipelines.

Since it looks like upstream is only one commit ahead of mandrel, may I suggest cherry-picking the "new dev cycle" commit and adding another commit with the pipeline update to keep things simple(r)?

@Karm
Copy link
Collaborator

Karm commented Jun 18, 2025

I though @jerboaa did the changes manually due to conflicts.

@jerboaa jerboaa force-pushed the mandrel/24.2-merge-2025-06-17 branch from e8f3839 to b47cdb1 Compare June 23, 2025 12:33
@jerboaa
Copy link
Collaborator Author

jerboaa commented Jun 23, 2025

@jerboaa something looks strange in this PR, I don't see which commit is responsible for the ga -> ea change in the pipelines.

Not sure how this happened. Maybe I had those changes locally when I started the merge. Removed now.

Since it looks like upstream is only one commit ahead of mandrel, may I suggest cherry-picking the "new dev cycle" commit and adding another commit with the pipeline update to keep things simple(r)?

I've just done a fresh merge which looks cleaner. OK now?

@zakkak
Copy link
Collaborator

zakkak commented Jun 23, 2025

@jerboaa it looks good now, but it's missing the ga -> ea change in https://github.com/graalvm/mandrel/blob/mandrel/24.2/.github/workflows/mandrel.yml shall we push this in a different PR?

Update; NVM I just saw #859

@jerboaa
Copy link
Collaborator Author

jerboaa commented Jun 23, 2025

Thanks. I'll merge this once CI is green.

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.

4 participants