properly determine go versions #3251
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
deitch
force-pushed
the
proper-semver-binaries
branch
from
1242df6 to
3af81f5
Compare
| @@ -6,7 +6,7 @@ RUN eve-alpine-deploy.sh | |||
| COPY ./ /newlog/. | |||
| WORKDIR /newlog | |||
|
|
|||
| RUN GO111MODULE=on CGO_ENABLED=0 go build -ldflags "-s -w" -mod=vendor -o /out/usr/bin/newlogd ./cmd | |||
| RUN GO111MODULE=on CGO_ENABLED=0 go build -ldflags "-s -w -X=main.Version=$(cat gopkgversion)" -mod=vendor -o /out/usr/bin/newlogd ./cmd | |||
There was a problem hiding this comment.
Suggested change
| RUN GO111MODULE=on CGO_ENABLED=0 go build -ldflags "-s -w -X=main.Version=$(cat gopkgversion)" -mod=vendor -o /out/usr/bin/newlogd ./cmd | |
| RUN GO111MODULE=on CGO_ENABLED=0 go build -ldflags "-s -w -X=main.Version=$(<gopkgversion)" -mod=vendor -o /out/usr/bin/newlogd ./cmd |
There was a problem hiding this comment.
or is that a bashism?
There was a problem hiding this comment.
It is a bashism. I originally had that, and spent easily 20-30 mins trying to figure out why the ldflag was blank. If I had submitted it right away, yetus would have told me, but I insisted on figuring it out myself first. 😆
Signed-off-by: Avi Deitcher <avi@deitcher.net>
deitch
force-pushed
the
proper-semver-binaries
branch
from
3af81f5 to
d320ff6
Compare
eriknordmark
approved these changes
May 31, 2023
|
I am happy to get a PR in for that. We also were thinking of doing that for kernel builds, so we can avoid some of the complex templating we do. I will try top get to a PR on that too. |
milan-zededa
approved these changes
May 31, 2023
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.
This extracts the unique
pkg/pillar/scripts/getversion.shand replaces it withtools/goversion.sh, which calculates the actual version for a go package using the go semver + pseudo-version rules. Unfortunately, no standard go tool does this for you.getversion.shwas being used only to set-X main.Version=<version>for pillar. That version was interesting, and didn't actually confirm to go rules.This now uses the standard version at a higher level, and then includes it in the 3 go binaries we build: edge-view, newlog, pillar.
The process is as follows:
Makefile, have everyeve-<pkg>target depend uponpkg/%/gopkgversionMakefile, thepkg/%/gopkgversiongenerates the version fromgoversion.shand saves it in the package inpkg/%/gopkgversion*gopkgversionhas been added to.gitignore-X main.Version=<version>has been updated to source from that file.The
gopkgversionnon-tracked file allows us to build in subdirs likepkg/pillar/orpkg/newlog/without requiring the entire.gitdirectory in the context.