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

Use VS 2022 by default for all JDK versions + skip freetype patching #3907

Merged
merged 3 commits into from
Aug 13, 2024

Conversation

sxa
Copy link
Member

@sxa sxa commented Aug 7, 2024

Updating to use VS2022 for all Temurin builds. This change has been approved by the PMC today, but if it causes any unexpected issues it can be reverted.

freetype patching can (and should be, otherwise it tries to reference things that don't exist) be skipped when we're not building JDK8 with VS2017 otherwise it tries to reference a file that isn't where it's expecting.

I'm currently testing with this branch on a machine which only has the VS2022 build tools installed and will report back once it's complete, but it's got to the middle of the build with jdk8u so I'm confident no other issues will show up, and standalone testing before creating this PR looked good.

Alternate solutions:

  • I was tempted to just comment out the individual TOOLCHAIN_VERSION overrides instead of deleting them for now so that we knew where they all were.
  • We could change all of the other versions explicitly to 2022 instead of providing a default at the start but this feels a lot cleaner given that we really do have a "standard" version that we're changing to.

This should leave OpenJ9 unaffected, but I'll tag in @AdamBrousseau too (LMK if you want this to apply to OpenJ9 as well)

Closes #2922

…ype patching

Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa sxa added the windows Issues that affect or relate to the WINDOWS OS label Aug 7, 2024
@sxa sxa self-assigned this Aug 7, 2024
@github-actions github-actions bot added macos Issues that affect or relate to the MAC OS testing Issues that enhance or fix our test suites labels Aug 7, 2024
@AdamBrousseau
Copy link
Contributor

I believe Semeru has switched over to VS2022 for all jdk versions for some time now. We should do the same for the OpenJ9 builds at Adoptium.

Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa
Copy link
Member Author

sxa commented Aug 8, 2024

I believe Semeru has switched over to VS2022 for all jdk versions for some time now. We should do the same for the OpenJ9 builds at Adoptium.

Thanks - PR updated. That makes it simpler :-)

Note for reviewers: We can probably optimise this file a bit more sine we have fewer conditions which are different across versions.

@sxa
Copy link
Member Author

sxa commented Aug 8, 2024

PR has failed the JDK8 check but it's attempting to build with compiler version 19.40.33807 instead of the 19.37.32822 which we use which I believe is the cause of the check failure and would impact running on our machines.

Noting that I'm not sure where the VS2022 comes from the github checks. https://github.com/adoptium/temurin-build/blob/master/.github/workflows/build.yml has an explicit reference to the URLs for earlier compiler versions but not 2022.

Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa sxa force-pushed the vs2022_everywhere branch from 9c00951 to 2a9d044 Compare August 9, 2024 15:58
@sxa
Copy link
Member Author

sxa commented Aug 9, 2024

Removing jdk8u/windows test for now (Ideally I'd make it conditionally set CONFIGURE_ARGS=--with-toolchain=2019 to let it build on an older version for now, but I haven't got the syntax worked out yet)

Copy link
Member

@gdams gdams left a comment

Choose a reason for hiding this comment

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

LGTM (although as discussed in Slack, I'd like to switch over to using the docker image as a base once we've got one published)

@sxa
Copy link
Member Author

sxa commented Aug 9, 2024

jdk8u test removed for now as the default win2022 image in GitHub Actions has a pre-installed VS2022 compiler which is newer than the one we want and fails to compiler jdk8u.

@AdamBrousseau
Copy link
Contributor

Let us know when you have a Windows build docker image. I'd be interested in using it too.

@sxa
Copy link
Member Author

sxa commented Aug 12, 2024

Let us know when you have a Windows build docker image. I'd be interested in using it too.

@AdamBrousseau There is a functional dockerfile for this in https://github.com/adoptium/infrastructure/pull/3702/files :-)

@sxa sxa requested a review from steelhead31 August 12, 2024 12:43
Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

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

Looks good!

@karianna
Copy link
Contributor

@sxa safe to merge?

@sxa
Copy link
Member Author

sxa commented Aug 13, 2024

@sxa safe to merge?

Yep I think so now - was leaving it a bit to ensure that anyone who wanted to comment could do so.

@sxa sxa merged commit f6cb265 into adoptium:master Aug 13, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
macos Issues that affect or relate to the MAC OS testing Issues that enhance or fix our test suites windows Issues that affect or relate to the WINDOWS OS
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Investigate changing jdk8u to build with VS2019 for Windows for July 2022 PSU
5 participants