Backport to 16.11: Versioning changes to make compatible with Managed Versioning
- Use all tags for version instead of just annotated tags
The git describe
command by default will only yield annotated tags.
The --tags
option changes this behavior to yield all tags. We use a
--match v*
anyways to filter version tags.
- Change VERSION file to include version only without leading v
The actual version doesn't lead with v
- that's just the tags.
This aligns the KAS version with other components, like Gitaly.
However, to not introduce a new versioning schema, the build tools of
gitlab-agent when prepend the v
again - it's just the VERSION
file
that changes to not have the leading v
.
- Introduce support for VERSION file
This change set introduces support for the VERSION
file used by other
GitLab projects (like Gitaly). It contains the SSoT for the version that
is built - especially for releases.
Using the version from this file is the fallback for when the build is
NOT happening in a git source tree - this is the case for official
GitLab KAS releases via CNG and Omnibus.
When building in a git source tree the VERSION
file is NOT used, but
the closest git tag with a commit reference suffix is used that is
produced by git describe
.
This change set also implies that the make
interface changed, because
it no longer supports providing the GIT_COMMIT
and GIT_TAG
arguments
that would in turn have been used for the release versioning.
However, this is still a non-breaking change because the argument will
just not be respected.
Preconditions for this change set to work properly:
-
release-tools needs to support the VERSION
file for KAS. -
(optional) change CNG to no longer provide the GIT_TAG
andGIT_COMMIT
make arguments. -
(optional) change Omnibus to no longer provide the GIT_TAG
andGIT_COMMIT
make arguments.
Changelog: other
- Rename agentk fips Makefile variables to be more specific
This change set simply makes the Agentk FIPS Makefile variables more specific to what they represent.