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

8278980: Update WebKit to 613.1 #77

Closed

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Feb 28, 2022

Nearly clean backport to jfx11u (the only conflict was in the copyright years in one of the unit tests). I tested this along with the other VS 2019 and WebKit 613.1 fixes together in the test-kcr-11.0.15 branch.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx11u pull/77/head:pull/77
$ git checkout pull/77

Update a local copy of the PR:
$ git checkout pull/77
$ git pull https://git.openjdk.java.net/jfx11u pull/77/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 77

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx11u/pull/77.diff

Co-authored-by: Ajit Ghaisas <aghaisas@openjdk.org>
Co-authored-by: Jay Bhaskar <jay.bhaskar@oracle.com>
Co-authored-by: Kevin Rushforth <kcr@openjdk.org>
Reviewed-by: kcr, jvos, aghaisas
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 28, 2022

👋 Welcome back kcr! 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.

@kevinrushforth
Copy link
Member Author

@arapte Can you review to confirm that the backport was done cleanly?

@openjdk openjdk bot changed the title Backport 6f28d912024495278c4c35ab054bc2aab480b3e4 8278980: Update WebKit to 613.1 Feb 28, 2022
@openjdk
Copy link

openjdk bot commented Feb 28, 2022

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

@openjdk openjdk bot added backport rfr Ready for review labels Feb 28, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 28, 2022

Webrevs

@arapte
Copy link
Member

arapte commented Mar 1, 2022

Verified that the backport is clean. and there was no diff except copyright year.

@openjdk
Copy link

openjdk bot commented Mar 1, 2022

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

8278980: Update WebKit to 613.1

Reviewed-by: arapte

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 1 new commit pushed to the master branch:

  • 2f2a07a: 8281089: JavaFX built with VS2019 and jlinked into JDK 11.x fails to start

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

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

@openjdk openjdk bot added the ready Ready to be integrated label Mar 1, 2022
@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 4, 2022

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

  • 6c3a482: 8265399: Update to Visual Studio 2019 version 16.9.3
  • 2f2a07a: 8281089: JavaFX built with VS2019 and jlinked into JDK 11.x fails to start

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 4, 2022
@openjdk openjdk bot closed this Mar 4, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Mar 4, 2022
@openjdk
Copy link

openjdk bot commented Mar 4, 2022

@kevinrushforth Pushed as commit 1057d01.

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

@kevinrushforth kevinrushforth deleted the 8278980-WebKit-613.1 branch March 4, 2022 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants