Merge pull request #4375 from vgteam/update-version-fast

Make `vg version` not take 2 builds to update with the current Git version

.gitignore

@@ -9,6 +9,8 @@ include/
 obj/
 cpp/
 .pre-build
+src/vg_git_version.hpp
+src/vg_environment_version.hpp
 *.o
 vg
 *.a

.gitlab-ci.yml

@@ -122,8 +122,7 @@ build-job:
     - PLATFORMS=linux/amd64
     - THREADS=8
     - DOCKER_TAG=ci-${CI_PIPELINE_IID}-${CI_COMMIT_SHA}
-    - make include/vg_git_version.hpp
-    - cat include/vg_git_version.hpp
+    - make version
     # Connect so we can upload our images
     - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
     # Note that A LOCAL CACHE CAN ONLY HOLD ONE TAG/TARGET AT A TIME!
@@ -165,7 +164,7 @@ production-build-job:
     - THREADS=8 # Oversubscribe since the ARM build will take way longer anyway.
     # Determine what we should be tagging vg Dockers as. If we're running on a Git tag we want to use that. Otherwise push over the tag we made already.
     - if [[ ! -z "${CI_COMMIT_TAG}" ]]; then DOCKER_TAG="${CI_COMMIT_TAG}" ; else DOCKER_TAG="ci-${CI_PIPELINE_IID}-${CI_COMMIT_SHA}"; fi
-    - make include/vg_git_version.hpp
+    - make version
     # Make sure ARM emulation is available.
     - if [[ "${CI_BUILDKIT_DRIVER}" != "kubernetes" ]] ; then docker run --privileged --rm tonistiigi/binfmt --install all || true ; fi
     # TODO: deduplicate this code with normal build above

Dockerfile

@@ -18,6 +18,11 @@ FROM base AS build
 ARG THREADS=8
 ARG TARGETARCH
 
+# If you didn't `make version` berfore building the Docker, you can provide a
+# version value here to claim to be.
+ARG VG_GIT_VERSION
+ENV VG_GIT_VERSION=${VG_GIT_VERSION:-unknown}
+
 RUN echo build > /stage.txt
 
 RUN apt-get -qq -y update && \
@@ -56,22 +61,13 @@ RUN find . -name CMakeCache.txt | xargs rm -f
 COPY Makefile /vg/Makefile
 RUN . ./source_me.sh && CXXFLAGS="$(if [ -z "${TARGETARCH}" ] || [ "${TARGETARCH}" = "amd64" ] ; then echo " -march=nehalem "; fi)" CFLAGS="$(if [ -z "${TARGETARCH}" ] || [ "${TARGETARCH}" = "amd64" ] ; then echo " -march=nehalem "; fi)" make -j $((THREADS < $(nproc) ? THREADS : $(nproc))) deps
 
-# Bring in the sources, which we need in order to build
+# Bring in the sources, which we need in order to build.
 COPY src /vg/src
 
 # Build all the object files for vg, but don't link.
 # Also pass the arch here
 RUN . ./source_me.sh && CXXFLAGS="$(if [ -z "${TARGETARCH}" ] || [ "${TARGETARCH}" = "amd64" ] ; then echo " -march=nehalem "; fi)" make -j $((THREADS < $(nproc) ? THREADS : $(nproc))) objs
 
-# Bring in any includes we pre-made, like the git version, if present
-COPY include /vg/include
-
-# Make sure version introspection is up to date
-RUN rm -f obj/version.o && . ./source_me.sh && CXXFLAGS="$(if [ -z "${TARGETARCH}" ] || [ "${TARGETARCH}" = "amd64" ] ; then echo " -march=nehalem "; fi)" make -j $((THREADS < $(nproc) ? THREADS : $(nproc))) obj/version.o
-
-# Announce the version file, which must exist by now
-RUN ls /vg/include && cat /vg/include/vg_git_version.hpp
-
 # Do the final build and link, knowing the version. Trim down the resulting binary but make sure to include enough debug info for profiling.
 RUN . ./source_me.sh && CXXFLAGS="$(if [ -z "${TARGETARCH}" ] || [ "${TARGETARCH}" = "amd64" ] ; then echo " -march=nehalem "; fi)" make -j $((THREADS < $(nproc) ? THREADS : $(nproc))) static && strip -d bin/vg