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

[24.1] Backport JDK 23+26 upgrade changes to 24.1 release tree #751

Closed

Conversation

jerboaa
Copy link
Collaborator

@jerboaa jerboaa commented Jun 25, 2024

Backport oracle#9078

@jerboaa jerboaa added affects/JDK23 Affects JDK 23 based Mandrel affects/24.1 Mandrel for JDK 23 labels Jun 25, 2024
@jerboaa jerboaa requested a review from zakkak June 25, 2024 09:47
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jun 25, 2024
@jerboaa
Copy link
Collaborator Author

jerboaa commented Jun 25, 2024

@jerboaa
Copy link
Collaborator Author

jerboaa commented Jun 26, 2024

CI run with this: https://github.com/graalvm/mandrel/actions/runs/9660331969

Summary of test failures is as follows (some of them we saw during nightly CI testing of graal/master when JDK 23 was the latest JDK release):

@jerboaa jerboaa force-pushed the mandrel/24.1-jdk-upgrade branch from 3bc452d to 22e2e94 Compare June 26, 2024 13:16
@jerboaa
Copy link
Collaborator Author

jerboaa commented Jun 26, 2024

@zakkak Could you please take a look? This would unbreak the JDK 23-based builds from the release branch.

@zakkak zakkak added this to the 24.1.0.0-Final milestone Jun 26, 2024
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.

Thank you @jerboaa!

In general I am in favor of cherry picking the commits with the -x flag to make it easier to track backports back to the original commits but in this case the original PR consists of 44 commits...

So I am thinking that in this case maybe we could amend the commit message to include the commit messages and hashes of the backported commits and rebase? (skipping the empty automated ones)

Please let me know if you would like me to take this over.

@zakkak
Copy link
Collaborator

zakkak commented Jun 26, 2024

Futhermore, oracle#9078 is most probably going to be backported upstream as well so this is just an "early backport" for us to get testing working again, right?

@jerboaa
Copy link
Collaborator Author

jerboaa commented Jun 26, 2024

Futhermore, oracle#9078 is most probably going to be backported upstream as well so this is just an "early backport" for us to get testing working again, right?

Yes, it'll be an early backport.

In general I am in favor of cherry picking the commits with the -x flag to make it easier to track backports back to the original commits but in this case the original PR consists of 44 commits...

So I am thinking that in this case maybe we could amend the commit message to include the commit messages and >hashes of the backported commits and rebase? (skipping the empty automated ones)

Wow, that seems like a bit of a waste of time in this case. I'm thinking of pushing this, then do git revert <sha> and merge the upstream changes once available.

Please let me know if you would like me to take this over.

If you feel like it's worth going this route of cherry-picking 44 commits then yes, please, take it over.

@zakkak
Copy link
Collaborator

zakkak commented Jun 26, 2024

Closing in favor of #757

@zakkak zakkak closed this Jun 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/JDK23 Affects JDK 23 based Mandrel affects/24.1 Mandrel for JDK 23 backport OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants