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

867: Your git version is: 2.30.0.284...., which is not a known ... #984

Closed
wants to merge 2 commits into from

Conversation

Martin-Buchholz
Copy link
Member

@Martin-Buchholz Martin-Buchholz commented Jan 15, 2021


Progress

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

Issue

  • SKARA-867: Your git version is: 2.30.0.284...., which is not a known ...

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 15, 2021

👋 Welcome back martin! 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 added the rfr label Jan 15, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 15, 2021

Webrevs

Copy link
Member

@JornVernee JornVernee left a comment

LGTM.

If you don't mind, please also add this version string as a test case to GitVersionTest: https://github.com/openjdk/skara/blob/master/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java#L46

@openjdk
Copy link

@openjdk openjdk bot commented Jan 15, 2021

@Martin-Buchholz 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.

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

867: Your git version is: 2.30.0.284...., which is not a known ...

Reviewed-by: jvernee

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:

  • 06e31a8: 749: If an integration fails at a late stage, it will both say that it succeeded and failed

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.

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 (@JornVernee) 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 Jan 15, 2021
@Martin-Buchholz
Copy link
Member Author

@Martin-Buchholz Martin-Buchholz commented Jan 15, 2021

@JornVernee. I made an effort to add some tests. Blind change below.

I tried and failed to run the test. Installing junit5 made no difference.
README.md wants junit5 5.6.2 but my reasonably up-to-date system has an older version.
I tried sh gradlew reproduce but it wants docker installed, and I'm reluctant to do that.
make test produces no output to explain why it apparently didn't even try to compile GitVersionTest.

diff --git a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java
index 8d9f7a58..92755fbd 100644
--- a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java
+++ b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java
@@ -43,7 +43,10 @@ public class GitVersionTest {
             arguments("git version 2.25.3", 2, 25, 3),
             arguments("git version 2.26.1", 2, 26, 1),
 
-            arguments("git version 2.27.0.windows.1", 2, 27, 0)
+            arguments("git version 2.27.0.windows.1", 2, 27, 0),
+
+            arguments("git version 2.30.0.284", 2, 30, 0),
+            arguments("git version 2.30.0.284.cafebabe-yoyodyne", 2, 30, 0)
         );
     }

@JornVernee
Copy link
Member

@JornVernee JornVernee commented Jan 15, 2021

With that patch GitVersionTest still passes on my machine, so adding that seems good to me.


FWIW, I'd expect gradle to fetch the right junit dependency for you. Skara is also used as a testing platform for bleeding edge Java tech, so that's why a recent version of junit is being used.

You should be able to run ./gradlew :vcs:test to trigger that particular set of tests to run, and GitVersionTest should be one of the first that runs. When running all the tests it might abort early due to a failure.

Using IntelliJ's built-in junit test runner should also work if you're using IntelliJ.

Lastly, if you enable GitHub actions for your fork some automated testing will also occur when you update the PR (results show at the bottom of the PR's 'Conversation' tab).

@Martin-Buchholz
Copy link
Member Author

@Martin-Buchholz Martin-Buchholz commented Jan 15, 2021

I enabled GitHub actions.
I had success with sh gradlew :vcs:test.
I added my pet 'git 10 bug' test.

Our git is configured to use main not master as default branch, causing many tests to fail. Which I ignored.

@Martin-Buchholz
Copy link
Member Author

@Martin-Buchholz Martin-Buchholz commented Jan 16, 2021

/integrate

@openjdk openjdk bot added the sponsor label Jan 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 16, 2021

@Martin-Buchholz
Your change (at version a83e253) is now ready to be sponsored by a Committer.

@JornVernee
Copy link
Member

@JornVernee JornVernee commented Jan 17, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Jan 17, 2021

@JornVernee @Martin-Buchholz Since your change was applied there has been 1 commit pushed to the master branch:

  • 06e31a8: 749: If an integration fails at a late stage, it will both say that it succeeded and failed

Your commit was automatically rebased without conflicts.

Pushed as commit c972718.

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