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

8326685: Linux builds not reproducible if two builds configured in different build folders #336

Conversation

andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented Mar 6, 2024

Backports the debug symbol mapping fix to ensure two builds built in different build output directories are identical.


Progress

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

Issue

  • JDK-8326685: Linux builds not reproducible if two builds configured in different build folders (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 336

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 6, 2024

👋 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 3b90ddfefea36d9f7f08ff11cd0cb099aa32b02b 8326685: Linux builds not reproducible if two builds configured in different build folders Mar 6, 2024
@openjdk
Copy link

openjdk bot commented Mar 6, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 6, 2024

⚠️ @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 Mar 6, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 6, 2024

Webrevs

@andrew-m-leonard
Copy link
Author

/approval request To enable reproducible builds from different build folders. Minimal risk.

@andrew-m-leonard
Copy link
Author

linux-cross-compile(riscv) is broken for unrelated build issues it seems

@openjdk
Copy link

openjdk bot commented Mar 7, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 11, 2024

@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:

8326685: Linux builds not reproducible if two builds configured in different build folders

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 26 new commits pushed to the master branch:

  • c0b5fdf: 8326140: src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp ReleaseStringChars might be missing in early returns
  • 50f447c: 8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate
  • 3086ed8: 8324834: Use _LARGE_FILES on AIX
  • 83cc4cb: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • 624e603: 8315834: Open source several Swing JSpinner related tests
  • 066af44: 8325137: com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java can fail in Xcomp with out of expected range
  • 8e439ba: 8317287: [macos14] InterJVMGetDropSuccessTest.java: Child VM: abnormal termination
  • 9a8d91a: 8315677: Open source few swing JFileChooser and other tests
  • c4c4b22: 8325326: [PPC64] Don't relocate in case of allocation failure
  • c26cad3: 8278527: java/util/concurrent/tck/JSR166TestCase.java fails nanoTime test
  • ... and 16 more: https://git.openjdk.org/jdk21u-dev/compare/ad1d32484a8130c9b641cff38c07e8544b3fd271...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 labels Mar 11, 2024
@andrew-m-leonard
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 11, 2024
@openjdk
Copy link

openjdk bot commented Mar 11, 2024

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

@jerboaa
Copy link
Contributor

jerboaa commented Mar 11, 2024

Failing RISC-V cross compile build in GHA is an infra problem.

@jerboaa
Copy link
Contributor

jerboaa commented Mar 11, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 11, 2024

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

  • 8f08066: 8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM
  • a75d19d: 8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java
  • c0b5fdf: 8326140: src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp ReleaseStringChars might be missing in early returns
  • 50f447c: 8326446: The User and System of jdk.CPULoad on Apple M1 are inaccurate
  • 3086ed8: 8324834: Use _LARGE_FILES on AIX
  • 83cc4cb: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • 624e603: 8315834: Open source several Swing JSpinner related tests
  • 066af44: 8325137: com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java can fail in Xcomp with out of expected range
  • 8e439ba: 8317287: [macos14] InterJVMGetDropSuccessTest.java: Child VM: abnormal termination
  • 9a8d91a: 8315677: Open source few swing JFileChooser and other tests
  • ... and 18 more: https://git.openjdk.org/jdk21u-dev/compare/ad1d32484a8130c9b641cff38c07e8544b3fd271...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 11, 2024
@openjdk openjdk bot closed this Mar 11, 2024
@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 Mar 11, 2024
@openjdk
Copy link

openjdk bot commented Mar 11, 2024

@jerboaa @andrew-m-leonard Pushed as commit e2858b5.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants