Set version var during make build #651
Conversation
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
Makefile
Outdated
| @@ -1,10 +1,12 @@ | |||
| CODE_COVERAGE_REPORT_FOLDER = $(PWD)/build/test-coverage | |||
| CODE_COVERAGE_REPORT_NAME_UNIT = $(CODE_COVERAGE_REPORT_FOLDER)/coverage-unit-report | |||
| VER_PKG = github.com/elastic/elastic-package/internal/version | |||
There was a problem hiding this comment.
Let's change it to:VERSION_IMPORT_PATH
There was a problem hiding this comment.
The choice was intentional to reduce line length. It's not far from its use, so the context is still strong. If you would still like me to make that change given this, let me know.
There was a problem hiding this comment.
Yes, I suggest extending it as VER_PKG might be misleading.
There was a problem hiding this comment.
It's not clear to me how, but done.
There was a problem hiding this comment.
My first guess was PKG_CONFIG as it is a Makefile.
Thanks for adjusting it.
Makefile
Outdated
| build: | ||
| go get -ldflags "-X github.com/elastic/elastic-package/internal/version.CommitHash=`git describe --always --long --dirty` -X github.com/elastic/elastic-package/internal/version.BuildTime=`date +%s`" \ | ||
| go install -ldflags \ | ||
| "-X $(VER_PKG).CommitHash=`git describe --always --long --dirty` -X $(VER_PKG).BuildTime=`date +%s` -X $(VER_PKG).Tag=`(git describe --exact-match --tags 2>/dev/null || echo '') | tr -d '\n'`" \ |
There was a problem hiding this comment.
Maybe this line can be split in multiple lines for easier readability.
There was a problem hiding this comment.
Unfortunately this is not possible due to the interaction of make string handling and -ldflags behaviour.
4 participants
This is a follow up from #648, @mtojek please take a look.
The change bakes in the current version tag during
make buildif the repo is checked out at a tagged version.Prior to this a user building
elastic-packageusingmakewould be given an executable that is unaware of its version. Nowmakewill leave an executable that renderselastic-package versionsimilar to this when the source tree is checked out at a tagged version:If not at a tagged version, no semver version is output.