-
Notifications
You must be signed in to change notification settings - Fork 157
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 support for jgit log search for latest commit when path is given. #422
Conversation
Solved an edge case where the latest found was actually one commit prior to the latest commit (the merge to master)
Hi, looks fine, but we're gonna need some tests, could you add some? |
@bgalek I'm not familiar with the tests in this project, could you maybe help me out here? |
@shashken sure! look here https://github.com/allegro/axion-release-plugin/tree/master/src/integration/groovy/pl/allegro/tech/build/axion/release |
…monorepo case and introduced two tests to catch those behaviors
@bgalek I implemented two tests to catch 2 cases for the last position, and implemented a new way to choose between lastCommit and the nearest merge. |
hmm I thought of something, I think the whole approach for monorepo with excludeDirs was wrong to begin with, what we expect: what is currently happening: This happens because we check if latestChange == tag, but we dont have to use this approach, instead we can go |
I'll try to look at it today |
@bgalek I implemented a new logic for monorepo versioning in versionResolver. |
@bgalek tag me here if you have any comments/suggestions |
@bgalek Reminder :) I used a local version of the plugin and it seems to solve the snapshot issue completely |
@shashken I gave it a quick look, overall seems ok, I'would change some formatting and names, but we can do it later, please give me little bit more time to think about the solution - but I think it's gonna be ok! we should also update docs :) |
@bgalek I committed some formatting and naming changes. better now? also what do you want to change in docs? the usage of the plugin remains the same :) |
@shashken cool! Sure, let's say monday - I'll also review some more PR's till then! |
@bgalek let me know what you want me to change, I'm available today |
I'll prepare a release, as promised! :) |
|
||
when: | ||
VersionContext version = resolver.resolveVersion(versionRules, tagRules, nextVersionRules) | ||
System.out.println("asdf") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shashken debug left ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed @bgalek
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thx for your contribution!
Add support for jgit log search for latest commit when path is given.
Solved an edge case where the latest found was actually one commit prior to the latest commit (the merge to master)
Tries to solve #332
@bgalek - please review
@farrukhnajmi FYI