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

8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters #1872

Closed

Conversation

RealLucy
Copy link
Contributor

@RealLucy RealLucy commented May 8, 2023

I would like to backport this change for parity with Oracle JDK 11.0.20.
Fix applies cleanly. Tests (SAP and GHA) are pending.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1872

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2023

👋 Welcome back lucy! 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 0853b330042ee9f17a288e19bd0fa1c46ec5b5d1 8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters May 8, 2023
@openjdk
Copy link

openjdk bot commented May 8, 2023

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

@openjdk
Copy link

openjdk bot commented May 8, 2023

@RealLucy This change now passes all automated pre-integration checks.

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

8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 8, 2023
@mlbridge
Copy link

mlbridge bot commented May 8, 2023

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels May 8, 2023
@RealLucy
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 10, 2023

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

  • 7b2d5fc: 8257856: Make ClassFileVersionsTest.java robust to JDK version updates
  • 6a28ccb: 8276880: Remove java/lang/RuntimeTests/exec/ExecWithDir as unnecessary
  • 4548929: 8303476: Add the runtime version in the release file of a JDK image
  • 1f601e9: 8303861: Error handling step timeouts should never be blocked by OnError and others

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 10, 2023

@RealLucy Pushed as commit 1f49004.

💡 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
1 participant