Skip to content

8317340: Windows builds are not reproducible if MS VS compiler install path differs#313

Closed
andrew-m-leonard wants to merge 1 commit intoopenjdk:masterfrom
openjdk-bots:andrew-m-leonard-backport-353d1396
Closed

8317340: Windows builds are not reproducible if MS VS compiler install path differs#313
andrew-m-leonard wants to merge 1 commit intoopenjdk:masterfrom
openjdk-bots:andrew-m-leonard-backport-353d1396

Conversation

@andrew-m-leonard
Copy link

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

Backport to enable reproducible Windows build natives, caused by differing VS installation paths.
Low risk additional -pathmap debug mapping.

This PR needs merging with follow on WSL build fix : https://bugs.openjdk.org/browse/JDK-8317601 / openjdk/jdk@bcc986b


Progress

  • Change must not contain extraneous whitespace
  • JDK-8317340 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8317340: Windows builds are not reproducible if MS VS compiler install path differs (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u.git pull/313/head:pull/313
$ git checkout pull/313

Update a local copy of the PR:
$ git checkout pull/313
$ git pull https://git.openjdk.org/jdk21u.git pull/313/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 313

View PR using the GUI difftool:
$ git pr show -t 313

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/313.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 1, 2023

👋 Welcome back aleonard! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 353d139682d530b74795cdca4753afba6766b2e3 8317340: Windows builds are not reproducible if MS VS compiler install path differs Nov 1, 2023
@openjdk
Copy link

openjdk bot commented Nov 1, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Nov 1, 2023
@openjdk
Copy link

openjdk bot commented Nov 1, 2023

⚠️ @andrew-m-leonard This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 1, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 1, 2023

Webrevs

@andrew-m-leonard
Copy link
Author

@andrew-m-leonard
Copy link
Author

Build & tests all good.

@andrew-m-leonard
Copy link
Author

/approval request Backport to enable reproducible Windows build natives, caused by differing VS installation paths.
Low risk additional -pathmap debug mapping.
This PR needs merging with follow on WSL build fix : https://bugs.openjdk.org/browse/JDK-8317601 backport PR #315

@openjdk
Copy link

openjdk bot commented Nov 3, 2023

@andrew-m-leonard
8317340: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Nov 3, 2023
@openjdk
Copy link

openjdk bot commented Nov 8, 2023

@andrew-m-leonard This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8317340: Windows builds are not reproducible if MS VS compiler install path differs

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 46 new commits pushed to the master branch:

  • 32987b7: 8317510: Change Windows debug symbol files naming to avoid losing info when an executable and a library share the same name
  • 37888d2: 8314191: C2 compilation fails with "bad AD file"
  • 9008889: 8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable
  • 0e2a520: 8318951: Additional negative value check in JPEG decoding
  • 0679922: 8294535: Add screen capture functionality to PassFailJFrame
  • 7f02e4a: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • 6632c8a: 8317374: Add Let's Encrypt ISRG Root X2
  • 243142c: 8314580: PhaseIdealLoop::transform_long_range_checks fails with assert "was tested before"
  • b93d884: 8318183: C2: VM may crash after hitting node limit
  • fb355df: 8309209: C2 failed "assert(_stack_guard_state == stack_guard_reserved_disabled) failed: inconsistent state"
  • ... and 36 more: https://git.openjdk.org/jdk21u/compare/f4ed66ee82c2d01eb5cef213af8f3d8bf0242d6c...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Nov 8, 2023
@andrew-m-leonard
Copy link
Author

/integrate
Ready and needs to be followed by #315

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 9, 2023
@openjdk
Copy link

openjdk bot commented Nov 9, 2023

@andrew-m-leonard
Your change (at version 9918a03) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 9, 2023

Going to push as commit 5cb041e.
Since your change was applied there have been 46 commits pushed to the master branch:

  • 32987b7: 8317510: Change Windows debug symbol files naming to avoid losing info when an executable and a library share the same name
  • 37888d2: 8314191: C2 compilation fails with "bad AD file"
  • 9008889: 8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable
  • 0e2a520: 8318951: Additional negative value check in JPEG decoding
  • 0679922: 8294535: Add screen capture functionality to PassFailJFrame
  • 7f02e4a: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • 6632c8a: 8317374: Add Let's Encrypt ISRG Root X2
  • 243142c: 8314580: PhaseIdealLoop::transform_long_range_checks fails with assert "was tested before"
  • b93d884: 8318183: C2: VM may crash after hitting node limit
  • fb355df: 8309209: C2 failed "assert(_stack_guard_state == stack_guard_reserved_disabled) failed: inconsistent state"
  • ... and 36 more: https://git.openjdk.org/jdk21u/compare/f4ed66ee82c2d01eb5cef213af8f3d8bf0242d6c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 9, 2023
@openjdk openjdk bot closed this Nov 9, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Nov 9, 2023
@openjdk
Copy link

openjdk bot commented Nov 9, 2023

@phohensee @andrew-m-leonard Pushed as commit 5cb041e.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@andrew-m-leonard
Copy link
Author

Thank you @phohensee , please can you also sponsor the required dependent PR, which is also ready now: #315
thanks
Andrew

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants