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

8285881: Update WebKit to 614.1 #109

Closed
wants to merge 1 commit into from
Closed

Conversation

arapte
Copy link
Member

@arapte arapte commented Aug 17, 2022

This is almost a clean backport, except a small conflict in a test file LoadTest.java.

The conflict was because fix for JDK-8253696 is not backported to jfx11u.
A test testLoadLocalCSS() was added as part of fix for JDK-8253696, which is not present in jfx11u.

No other conflict were observed.

/integrate auto


Progress

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

Issue

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 109

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx11u/pull/109.diff

Co-authored-by: Ambarish Rapte <arapte@openjdk.org>
Co-authored-by: Kevin Rushforth <kcr@openjdk.org>
Co-authored-by: Jay Bhaskar <jbhaskar@openjdk.org>
Reviewed-by: kcr, arapte, mstrauss, jvos
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 17, 2022

👋 Welcome back arapte! 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 7e48413eb0f9eb3dcbd9d3a1572fc311036092c8 8285881: Update WebKit to 614.1 Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

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

@openjdk openjdk bot added the backport label Aug 17, 2022
@arapte
Copy link
Member Author

arapte commented Aug 17, 2022

@kevinrushforth
Please take a look, there was minor conflict as explained in the description.

@openjdk openjdk bot added the clean label Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

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

8285881: Update WebKit to 614.1

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 Ready to be integrated rfr Ready for review auto labels Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

@arapte This pull request will be automatically integrated when it is ready

@openjdk
Copy link

openjdk bot commented Aug 17, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Aug 17, 2022

Going to push as commit 4bd6877.

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

openjdk bot commented Aug 17, 2022

@openjdk[bot] Pushed as commit 4bd6877.

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

@kevinrushforth
Copy link
Member

Odd that Skara marked this as clean given that there was a (trivial) merge conflict that had to be resolved. I plan to file a bug against Skara.

@mlbridge
Copy link

mlbridge bot commented Aug 17, 2022

Webrevs

@arapte arapte deleted the 8285881 branch August 17, 2022 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto backport clean integrated Pull request has been integrated
2 participants