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

716: Git version check pattern matching is too strict #838

Closed
wants to merge 1 commit into from

Conversation

@tstuefe
Copy link
Member

@tstuefe tstuefe commented Sep 22, 2020

Hi,

may I have reviews please for this small fix. On my Ubuntu 16.4 box I run with git 2.7.0 (so far without any problems, but that is another story). Skara wants a newer version and does a version check. That check fails to parse the version number correctly.

https://bugs.openjdk.java.net/browse/SKARA-716

Tests: tried to run gradlw test on my Linux box but I get test errors - but those errors also appear on a clean repo (see https://mail.openjdk.java.net/pipermail/skara-dev/2020-September/003410.html), I am quite sure they have anything to do with my fix.


Progress

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

Issue

  • SKARA-716: Git version check pattern matching is too strict

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/838/head:pull/838
$ git checkout pull/838

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 22, 2020

👋 Welcome back stuefe! 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
Copy link

@openjdk openjdk bot commented Sep 22, 2020

⚠️ @tstuefe a branch with the same name as the source branch for this pull request (master) is present in the target repository. If you eventually integrate this pull request then the branch master in your personal fork will diverge once you sync your personal fork with the upstream repository.

To avoid this situation, create a new branch for your changes and reset the master branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME.

$ git checkout -b NEW-BRANCH-NAME
$ git branch -f master 36edd9ea201bb6e25654e65860b359492539adf4
$ git push -f origin master

Then proceed to create a new pull request with NEW-BRANCH-NAME as the source branch and close this one.

@openjdk openjdk bot added the rfr label Sep 22, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2020

@tstuefe To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request.

In order to have an RFR email automatically sent to the correct mailing list, you will need to add one or more labels manually using the /label add "label" command. The following labels are valid: bots build cli libs skara-dev skara-extra.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 22, 2020

Webrevs

@edvbld edvbld closed this Sep 22, 2020
@edvbld
edvbld approved these changes Sep 22, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@edvbld
Copy link
Member

@edvbld edvbld commented Sep 22, 2020

@tstuefe the tests are failing because you have a too old Mercurial version.

@edvbld edvbld reopened this Sep 22, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2020

@tstuefe This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

716: Git version check pattern matching is too strict

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

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

  • 4f170e4: 710: Map share/utilities to hotspot-dev
  • b69b6d2: 657: Integrate command uses "merge request" in failure message
  • 72317c6: 663: Bad URL in PR created by openjdk-bot in responnse to merge conflict

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 4f170e4e66ee89b70e0a9b309e332afe260f2bab.

As you do not have Committer status in this projectan existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@edvbld) 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 22, 2020
@tstuefe
Copy link
Member Author

@tstuefe tstuefe commented Sep 22, 2020

/issue SKARA-716

@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2020

@tstuefe This issue is referenced in the PR title - it will now be updated.

@tstuefe
Copy link
Member Author

@tstuefe tstuefe commented Sep 22, 2020

/integrate

@openjdk openjdk bot added the sponsor label Sep 22, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2020

@tstuefe
Your change (at version 30dd1ec) is now ready to be sponsored by a Committer.

@edvbld
Copy link
Member

@edvbld edvbld commented Sep 22, 2020

/sponsor

@openjdk openjdk bot closed this Sep 22, 2020
@openjdk openjdk bot added integrated and removed sponsor ready rfr labels Sep 22, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2020

@edvbld @tstuefe Since your change was applied there have been 3 commits pushed to the master branch:

  • 4f170e4: 710: Map share/utilities to hotspot-dev
  • b69b6d2: 657: Integrate command uses "merge request" in failure message
  • 72317c6: 663: Bad URL in PR created by openjdk-bot in responnse to merge conflict

Your commit was automatically rebased without conflicts.

Pushed as commit 179f923.

💡 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants