Conversation
Collaborator
Cokemonkey11
commented
Jul 30, 2020
- Reintroduces the jgit change applied with !951 and !958
- Fix the regression in writing git tag in CompileTime.java by reading the tag
- tested that this behaves correctly with tag and does something not crazy without tag
Member
|
need test/proof that this works before merge. |
Collaborator
Author
|
Hey @Frotty thanks for taking a look. I tested this manually, but didn't add any unit tests: de.peeeq.wurstscript $ git tag
test
de.peeeq.wurstscript $ ./gradlew :versionInfoFile
Deprecated Gradle features were used in this build, making it incompatible with Gradle 6.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/5.0/userguide/command_line_interface.html#sec:command_line_warnings
BUILD SUCCESSFUL in 1s
1 actionable task: 1 executed
de.peeeq.wurstscript $ find . -name 'CompileTimeInfo.java' | xargs cat | rg version=
public static final String version="1.8.1.0-test";Is that acceptable? |
c817e30 to
5e5cfad
Compare
Member
|
i dont even know what u mean by tag. The tasks reads the commit hash and adds it to the version so when someone pastes a log u know they have a custom build, and you know which commit it is from. |
Collaborator
Author
|
@Frotty you're mistaken. The commit hash and custom builds is not all it does. Hudson reads the tag from the git repo - i.e. CI depends on this behavior - see http://peeeq.de/hudson/job/Wurst/1257/consoleFull You'll recall that the reason #951 was partially reverted is because the move to jgit broke CI. This PR is to fix that. Btw, all of this is explained in the original comment from 30th July |
This file contains hidden or 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
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.