Skip to content

Fix tags#963

Merged
Frotty merged 3 commits intowurstscript:masterfrom
Cokemonkey11:fix_tags
Mar 18, 2021
Merged

Fix tags#963
Frotty merged 3 commits intowurstscript:masterfrom
Cokemonkey11:fix_tags

Conversation

@Cokemonkey11
Copy link
Collaborator

  • 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

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 59.823% when pulling c817e30 on Cokemonkey11:fix_tags into 182ef7f on wurstscript:master.

@Frotty
Copy link
Member

Frotty commented Aug 6, 2020

need test/proof that this works before merge.

@Cokemonkey11
Copy link
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?

@Frotty
Copy link
Member

Frotty commented Nov 19, 2020

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.

@Cokemonkey11
Copy link
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

@Frotty Frotty merged commit 098fcc5 into wurstscript:master Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants