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

Add buildnum extraction support for OpenJFX tags #241

Closed
wants to merge 1 commit into from

Conversation

@rwestberg
Copy link
Member

rwestberg commented Nov 7, 2019

Hi all,

Please review this minor change that enables parsing of the tag format used in the OpenJFX project.

Best regards,
Robin

Progress

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

Approvers

  • Kevin Rushforth (kcr - no project role)
  • Erik Helin (ehelin - Reviewer)
@bridgekeeper

This comment has been minimized.

Copy link

bridgekeeper bot commented Nov 7, 2019

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@openjdk openjdk bot added the rfr label Nov 7, 2019
@mlbridge

This comment has been minimized.

Copy link

mlbridge bot commented Nov 7, 2019

Webrevs

Copy link
Member

kevinrushforth left a comment

I presume this will work. I'm curious as to why this is needed, though. As long as a tag passes jcheck, why does the vcs module need to know about valid tag formats that a particular project might choose to use?

*/

private final static String legacyOpenJDKVersionPattern = "(jdk([0-9]{1,2}(u[0-9]{1,3})?))";
private final static String legacyHSVersionPattern = "((hs[0-9]{1,2}(\\.[0-9]{1,3})?))";
private final static String legacyBuildPattern = "(-b)([0-9]{2,3})";
private final static String OpenJDKVersionPattern = "(jdk-([0-9]+(\\.[0-9]){0,3}))(\\+)([0-9]+)";
private final static String OpenJFXVersionPattern = "((?:jdk-){0,1}([1-9](?:(?:[0-9]*)(\\.(?:0|[1-9][0-9]*)){0,3})))(?:(\\+)([0-9]+)|(-ga))";

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Nov 7, 2019

Member

Not related to this change, but the OpenJDKVersionPattern also will need support for *-ga tags.

@@ -106,6 +109,9 @@ public String version() {
* @return
*/
public int buildNum() {
if (buildNum == null) {

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Nov 7, 2019

Member

Under what conditions will this be null? When using a *-ga tag? If so, this seems fine.

@rwestberg

This comment has been minimized.

Copy link
Member Author

rwestberg commented Nov 7, 2019

Currently the notifier will ignore all tags that cannot be parsed as an OpenJDKTag (this will be fixed in a separate change). But if the tag can be parsed, the notifier also includes a summary of changes that have been included since the last build. So this change both unblocks tag notifications for JFX as well as this summary.

Copy link
Member

kevinrushforth left a comment

Sounds good.

@edvbld
edvbld approved these changes Nov 7, 2019
Copy link
Member

edvbld left a comment

Looks good!

@openjdk openjdk bot removed the rfr label Nov 7, 2019
@openjdk

This comment has been minimized.

Copy link

openjdk bot commented Nov 7, 2019

@rwestberg This change can now be integrated. The commit message will be:

Add buildnum extraction support for OpenJFX tags

Reviewed-by: kcr, ehelin
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch:

  • e294ce9: Add ReadOnlyRepository.annotate(Tag t) method
  • b1e3d87: 151: Encode single dot characters in the SMTP client

Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge master into your branch first.

  • To integrate this PR with the above commit message, type /integrate in a new comment.
@openjdk openjdk bot added the ready label Nov 7, 2019
@rwestberg

This comment has been minimized.

Copy link
Member Author

rwestberg commented Nov 8, 2019

/integrate

@openjdk openjdk bot closed this Nov 8, 2019
@openjdk openjdk bot added the integrated label Nov 8, 2019
@openjdk

This comment has been minimized.

Copy link

openjdk bot commented Nov 8, 2019

@rwestberg The following commits have been pushed to master since your change was applied:

  • e294ce9: Add ReadOnlyRepository.annotate(Tag t) method
  • b1e3d87: 151: Encode single dot characters in the SMTP client

Your commit was automatically rebased without conflicts.

Pushed as commit 069620b.

@openjdk openjdk bot removed the ready label Nov 8, 2019
@mlbridge

This comment has been minimized.

Copy link

mlbridge bot commented Nov 8, 2019

Mailing list message from Robin Westberg on skara-dev:

Changeset: 069620b
Author: Robin Westberg
Date: 2019-11-08 08:38:45 +0000
URL: https://git.openjdk.java.net/skara/commit/069620bc

Add buildnum extraction support for OpenJFX tags

Reviewed-by: kcr, ehelin

! vcs/src/main/java/org/openjdk/skara/vcs/openjdk/OpenJDKTag.java
! vcs/src/test/java/org/openjdk/skara/vcs/openjdk/OpenJDKTagTests.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.