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

Update windows_repro_build_compare.sh to allow for windows Redist devkit #4022

Merged
merged 17 commits into from
Nov 5, 2024

Conversation

andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard commented Nov 1, 2024

Fixes #4021

Don't check local Windows system UCRT if --use-adoptium-devkit used, as the correct versions will be downloaded.

Grinder test: https://ci.adoptium.net/job/Grinder/11287/

@andrew-m-leonard andrew-m-leonard self-assigned this Nov 1, 2024
@github-actions github-actions bot added the windows Issues that affect or relate to the WINDOWS OS label Nov 1, 2024
@github-actions github-actions bot added the testing Issues that enhance or fix our test suites label Nov 1, 2024
@sophia-guo
Copy link
Contributor

This situation also happens to linux https://github.com/adoptium/temurin-build/blob/master/tooling/reproducible/linux_repro_build_compare.sh#L166, which suggests another opportunity for code refactoring and consolidating for different platforms.

Creating a reusable function or module will make the logic easier to understand, test and maintain.

@andrew-m-leonard
Copy link
Contributor Author

This situation also happens to linux https://github.com/adoptium/temurin-build/blob/master/tooling/reproducible/linux_repro_build_compare.sh#L166, which suggests another opportunity for code refactoring and consolidating for different platforms.

Creating a reusable function or module will make the logic easier to understand, test and maintain.

It is the same yes, although the apart from the check for the --use-adoptium-flag, the GCC vs VisualStudio logic is different

Copy link
Contributor

@adamfarley adamfarley left a comment

Choose a reason for hiding this comment

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

LGTM

@andrew-m-leonard andrew-m-leonard merged commit cb952f4 into adoptium:master Nov 5, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing Issues that enhance or fix our test suites windows Issues that affect or relate to the WINDOWS OS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rebuild_Same_JDK_Reproducibility_Test_win fails with Redist devkit
4 participants