return 0.0.0.0 if no tag found #16
Merged
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
1 task
ginglis13
added a commit
to runfinch/finch
that referenced
this pull request
Oct 6, 2023
Issue #, if available: *Description of changes:* upstream dependency go-winres uses `git tag` to embed versioning in Windows binary. However, if the repo from which finch is being built has no tags, build will fail. Add note on how to fetch upstream finch tags. See tc-hib/go-winres#16 *Testing done:* - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Gavin Inglis <[email protected]>
|
Hi, Thank you for this pull request. Maybe we should use "0.0.0.0" instead ? |
The git-tag value means the current tag will be retrieved from git describe --tags and add it to the properties of the executable: https://github.com/tc-hib/go-winres#automatic-version-from-git This does not work if the current working repository has no tags in its history, such as my fork of this repo. Instead, return a "0.0.0.0" version. Signed-off-by: Gavin Inglis <[email protected]>
ginglis13
changed the title
--always in git describe --tags
Sounds good to me. Added a revision that uses "0.0.0.0" |
vsiravar
pushed a commit
to runfinch/finch
that referenced
this pull request
Oct 17, 2023
Issue #, if available: *Description of changes:* upstream dependency go-winres uses `git tag` to embed versioning in Windows binary. However, if the repo from which finch is being built has no tags, build will fail. Add note on how to fetch upstream finch tags. See tc-hib/go-winres#16 *Testing done:* - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Gavin Inglis <[email protected]>
vsiravar
pushed a commit
to runfinch/finch
that referenced
this pull request
Oct 17, 2023
Issue #, if available: *Description of changes:* upstream dependency go-winres uses `git tag` to embed versioning in Windows binary. However, if the repo from which finch is being built has no tags, build will fail. Add note on how to fetch upstream finch tags. See tc-hib/go-winres#16 *Testing done:* - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Gavin Inglis <[email protected]> Signed-off-by: Vishwas Siravara <[email protected]>
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.
Description
The git-tag value means the current tag will be retrieved from
git describe --tagsand add it to the properties of the executable: https://github.com/tc-hib/go-winres#automatic-version-from-git This does not work if the current working repository has no tags in its history, such as my fork of this repo.Instead use
git describe --tags --alwaysto always return a value fromgit describe- defaulting to the latest commit if no tags found: https://git-scm.com/docs/git-describe#Documentation/git-describe.txt---alwaysAlso, updates go.mod and go.sum
Testing
go test ./...Context
In cmd/finch/main_windows.go, we are calling go-winres make with flags set to git-tag:
https://github.com/runfinch/finch/blob/76adf59588b1455a535f389eb4c714e1b9daede3/cmd/finch/main_windows.go#L6
Building is failing if the build occurs in a repository with no local tags. It’s only after I have my upstream remote set to the main finch repo and run
git fetch upstream --tagsthat I can successfully build finch.