#361 fixed preCommitText issue with whitespace and fixed failing unit… #381
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…failing unitTest for GitReleasePluginTests
Vampire
reviewed
Feb 20, 2024
| @@ -130,7 +130,8 @@ class GitReleasePluginTests extends Specification { | |||
| executor.exec(['git', 'checkout', 'myBranch'], failOnStderr: false, directory: remoteRepo, env: [:]) | |||
| executor.exec(['git', 'reset', '--hard', 'HEAD'], failOnStderr: false, directory: remoteRepo, env: [:]) | |||
| then: | |||
| newestCommit.contains("Signed-off-by: Unit Test <unit@test>") | |||
| // newestCommit.contains("Signed-off-by: Unit Test <unit@test>") | |||
| newestCommit.contains("[Gradle Release Plugin] - new version commit: '1.1'") | |||
There was a problem hiding this comment.
This renders the test useless. The point is, that it tests whether the -s is given to Git and thus the Signed-off-by line added.
Here this also works just fine.
Vampire
reviewed
Feb 20, 2024
Comment on lines
+211
to
+214
| preCommitText = '[Gradle Release Plugin]' | ||
| preTagCommitMessage = 'pre tag commit: ' | ||
| tagCommitMessage = 'creating tag: ' | ||
| newVersionCommitMessage = 'new version commit: ' |
There was a problem hiding this comment.
I don't think this is a good idea.
This changes the result for everyone setting the preCommitText already which is a text that should be prepended additionally to the other configured messages.
Vampire
reviewed
Feb 20, 2024
| @@ -22,8 +22,8 @@ class PreTagCommit extends BaseReleaseTask { | |||
| if (projectAttributes.usesSnapshot || projectAttributes.versionModified || projectAttributes.propertiesFileCreated) { | |||
| // should only be committed if the project was using a snapshot version. | |||
| String message = extension.preTagCommitMessage.get() + " '${tagName()}'." | |||
| if (extension.preCommitText) { | |||
| message = "${extension.preCommitText.get()} ${message}" | |||
| if (extension.preCommitText.get()) { | |||
There was a problem hiding this comment.
This is the only line in the PR that I would second, as it also is the same I did in #384 not seeing this PR. :-D
There was a problem hiding this comment.
Which was merged just now, so my recommendation would be to close this PR unmerged. :-)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…Test for GitReleasePluginTests