Makefile/packit: avoid duplicate implementation of "version"

osbuild · Jan 10, 2025 · 00e18fe · 00e18fe
1 parent 4f1816c
commit 00e18fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.packit.yaml b/.packit.yaml
@@ -16,7 +16,7 @@ srpm_build_deps:
 
 actions:
   # v1 just the default prior to having tags
-  get-current-version: bash -c "( git describe --tags --abbrev=0 2>/dev/null || echo v1 ) | sed 's|v||'"
+  get-current-version: bash -c "make show-version"
   post-upstream-clone: bash -c "go mod vendor && ./tools/rpm_spec_add_provides_bundle.sh"
   create-archive: bash -c "make release_artifacts"
 

diff --git a/Makefile b/Makefile
@@ -189,3 +189,6 @@ release_artifacts: $(RPM_TARBALL_VERSIONED)
 
 lint:
 	pre-commit run --all
+
+show-version:  ## Show the generated version to be reused in tools like `.packit.yaml`
+	@echo "$(VERSION)"