diff --git a/Makefile b/Makefile index c06df8a..e0ec475 100644 --- a/Makefile +++ b/Makefile @@ -66,14 +66,15 @@ RPM: scripts/cc-metric-collector.spec @eval $$(rpm --eval "ARCH='%{_arch}' RPMDIR='%{_rpmdir}' SOURCEDIR='%{_sourcedir}' SPECDIR='%{_specdir}' SRPMDIR='%{_srcrpmdir}' BUILDDIR='%{_builddir}'") @mkdir --parents --verbose "$${RPMDIR}" "$${SOURCEDIR}" "$${SPECDIR}" "$${SRPMDIR}" "$${BUILDDIR}" # Create source tarball - @VERS=$$(git describe --tags) + @COMMITISH="HEAD" + @VERS=$$(git describe --tags $${COMMITISH}) @VERS=$${VERS#v} @VERS=$${VERS//-/_} @eval $$(rpmspec --query --queryformat "NAME='%{name}' VERSION='%{version}' RELEASE='%{release}' NVR='%{NVR}' NVRA='%{NVRA}'" --define="VERS $${VERS}" "$${SPECFILE}") @PREFIX="$${NAME}-$${VERSION}" @FORMAT="tar.gz" @SRCFILE="$${SOURCEDIR}/$${PREFIX}.$${FORMAT}" - @git archive --verbose --format "$${FORMAT}" --prefix="$${PREFIX}/" --output="$${SRCFILE}" HEAD + @git archive --verbose --format "$${FORMAT}" --prefix="$${PREFIX}/" --output="$${SRCFILE}" $${COMMITISH} # Build RPM and SRPM @rpmbuild -ba --define="VERS $${VERS}" --rmsource --clean "$${SPECFILE}" # Report RPMs and SRPMs when in GitHub Workflow