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

1167: Update the mapping of files for the client group #1217

Closed
wants to merge 2 commits into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Sep 10, 2021

A few records related to the client are added to the jdk.json


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1167: Update the mapping of files for the client group

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1217

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 10, 2021

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

@mrserb mrserb marked this pull request as ready for review Sep 10, 2021
@@ -12,17 +12,21 @@
],
"client": [
"make/\\w+(Demos|X11)",
"make/autoconf/lib-(font|freetype|x11)",
"make/autoconf/lib-(alsa|cups|font|freetype|x11)",
Copy link
Member Author

@mrserb mrserb Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it fine in a few places to use the "font" instead of "fontconfig" and "x11" instead of "x11wrappergen"?

Copy link
Member

@erikj79 erikj79 Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that the regexp is used to match a prefix. If you add a slash at the end, you enforce a full directory name instead of a partial match. Feel free to rewrite as you like.

@@ -12,17 +12,21 @@
],
"client": [
"make/\\w+(Demos|X11)",
"make/autoconf/lib-(font|freetype|x11)",
"make/autoconf/lib-(alsa|cups|font|freetype|x11)",
"make/data/(font|x11)",
"make/jdk/src/classes/build/tools/(generatenimbus/|x11wrappergen)",
Copy link
Member Author

@mrserb mrserb Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why nimbus has a slash at the end? it can be removed?

Copy link
Member

@erikj79 erikj79 Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As said in the other comment, the slash enforces a full match on a directory instead of a partial. I don't know why this particular dir has a slash when so many others do not. Feel free to rewrite as you like.

@openjdk openjdk bot added the rfr label Sep 10, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 10, 2021

Webrevs

@@ -12,17 +12,21 @@
],
"client": [
"make/\\w+(Demos|X11)",
"make/autoconf/lib-(font|freetype|x11)",
"make/autoconf/lib-(alsa|cups|font|freetype|x11)",
Copy link
Member

@erikj79 erikj79 Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that the regexp is used to match a prefix. If you add a slash at the end, you enforce a full directory name instead of a partial match. Feel free to rewrite as you like.

@@ -12,17 +12,21 @@
],
"client": [
"make/\\w+(Demos|X11)",
"make/autoconf/lib-(font|freetype|x11)",
"make/autoconf/lib-(alsa|cups|font|freetype|x11)",
"make/data/(font|x11)",
"make/jdk/src/classes/build/tools/(generatenimbus/|x11wrappergen)",
Copy link
Member

@erikj79 erikj79 Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As said in the other comment, the slash enforces a full match on a directory instead of a partial. I don't know why this particular dir has a slash when so many others do not. Feel free to rewrite as you like.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 10, 2021

@mrserb 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.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

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

1167: Update the mapping of files for the client group

Reviewed-by: erikj, kcr

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79, @kevinrushforth) but any other Committer may sponsor as well.

➡️ 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 the ready label Sep 10, 2021
@mrserb
Copy link
Member Author

@mrserb mrserb commented Sep 11, 2021

/integrate

@openjdk openjdk bot added the sponsor label Sep 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2021

@mrserb
Your change (at version e87b712) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added ready and removed ready labels Sep 11, 2021
@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Sep 11, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2021

Going to push as commit d816d14.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2021

@kevinrushforth @mrserb Pushed as commit d816d14.

💡 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
3 participants