fix(packit): generate vendor tarball also in pre-sync

Signed-off-by: Miguel Martín <[email protected]>

Author: mmartinv

.packit.yaml

@@ -10,7 +10,6 @@ files_to_sync:
       - ".packit.yaml"
       - "build/package/rpm/go-fdo-client.spec"
       - "build/package/rpm/go-vendor-tools.toml"
-      - "build/package/rpm/go-fdo-client-*-vendor.tar.bz2"
     dest: .
 
 upstream_package_name: go-fdo-client
@@ -39,32 +38,11 @@ packages:
     pkg_tool: centpkg
 
 actions:
-  post-upstream-clone:
-    - |
-      bash -xc '
-      #! /bin/bash
-      export SPEC_FILE="${PACKIT_UPSTREAM_REPO}/build/package/rpm/go-fdo-client.spec"
-      export COMMIT="$(GIT_DIR="${PACKIT_UPSTREAM_REPO}"/.git git rev-parse HEAD)"
-      sed -i "s/^%global commit\(\s*\).*/%global commit\1${COMMIT}/" ${SPEC_FILE}
-      '
+  pre-sync:
+    - bash -c "make packit-vendor-tarball VERSION=${PACKIT_PROJECT_VERSION}"
   post-modifications:
     # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update
-    - |
-      bash -xc '
-      #! /bin/bash
-      export GOTOOLCHAIN=auto
-      export BASE_DIR=${PACKIT_UPSTREAM_REPO}/build/package/rpm
-      export GO_VENDOR_TOOLS_CONFIG=${BASE_DIR}/go-vendor-tools.toml
-      export SPEC_FILE=${BASE_DIR}/go-fdo-client.spec
-      # Download the source tarball (Source0) needed by go_vendor_archive
-      spectool -g -C ${BASE_DIR} ${SPEC_FILE} || exit 1
-      go_vendor_archive create --config ${GO_VENDOR_TOOLS_CONFIG} ${SPEC_FILE}
-      go_vendor_license \
-        --config ${GO_VENDOR_TOOLS_CONFIG} \
-        --path ${SPEC_FILE} \
-        report \
-        --verify-spec
-      '
+    - bash -c "make packit-vendor-tarball VERSION=${PACKIT_PROJECT_VERSION}"
 
 jobs:
 

Makefile

@@ -1,18 +1,13 @@
-PROJECT                   := go-fdo-client
-RPM_BASE_DIR              := $(CURDIR)/build/package/rpm
-SPEC_FILE_NAME            := $(PROJECT).spec
-SPEC_FILE                 := $(RPM_BASE_DIR)/$(SPEC_FILE_NAME)
-COMMIT_SHORT              := $(shell git rev-parse --short HEAD)
-VERSION                   := $(shell bash -c "set -o pipefail; git describe --tags | sed -e 's/^v//' -e 's/-.*//'")
-ifeq ($(VERSION),)
-VERSION                   := $(shell grep 'Version:' $(SPEC_FILE) | awk '{printf "%s", $$2}')
-endif
+#! /usr/bin/make -f
 
+PROJECT                   := go-fdo-client
 ARCH                      := $(shell uname -m)
-
 SOURCEDIR                 := $(CURDIR)/build/package/rpm
 SPEC_FILE_NAME            := $(PROJECT).spec
 SPEC_FILE                 := $(SOURCEDIR)/$(SPEC_FILE_NAME)
+COMMIT_SHORT              := $(shell git rev-parse --short HEAD)
+VERSION                   := $(shell grep 'Version:' $(SPEC_FILE) | awk '{printf "%s", $$2}').git$(COMMIT_SHORT)
+
 GO_VENDOR_TOOLS_FILE_NAME := go-vendor-tools.toml
 GO_VENDOR_TOOLS_FILE      := $(SOURCEDIR)/$(GO_VENDOR_TOOLS_FILE_NAME)
 
@@ -120,6 +115,11 @@ $(RPMBUILD_SRPM_FILE): $(RPMBUILD_SPECFILE) $(RPMBUILD_TARBALL) $(RPMBUILD_GOLAN
 		--define "_buildrootdir $(RPMBUILD_BUILDROOT_DIR)" \
 		$(RPMBUILD_SPECFILE)
 
+# Build SRPM locally (outputs under ./rpmbuild)
+.PHONY: srpm
+srpm: $(RPMBUILD_SRPM_FILE)
+
+
 $(RPMBUILD_RPM_FILE): $(RPMBUILD_SPECFILE) $(RPMBUILD_TARBALL) $(RPMBUILD_GOLANG_VENDOR_TOOLS_FILE)
 	command -v rpmbuild >/dev/null || { echo "rpmbuild missing"; exit 1; }
 	# Uncomment to auto-install build deps on your host:
@@ -134,10 +134,18 @@ $(RPMBUILD_RPM_FILE): $(RPMBUILD_SPECFILE) $(RPMBUILD_TARBALL) $(RPMBUILD_GOLANG
 		--define "_buildrootdir $(RPMBUILD_BUILDROOT_DIR)" \
 		$(RPMBUILD_SPECFILE)
 
-# Build SRPM locally (outputs under ./rpmbuild)
-.PHONY: srpm
-srpm: $(RPMBUILD_SRPM_FILE)
-
 # Build binary RPM locally (optional)
 .PHONY: rpm
 rpm: $(RPMBUILD_RPM_FILE)
+
+.PHONY: packit-vendor-tarball
+packit-vendor-tarball:
+	export GOTOOLCHAIN=auto; \
+	# Download the source tarball (Source0) needed by go_vendor_archive
+	spectool -g -C $(SOURCEDIR) $(SPEC_FILE); \
+	go_vendor_archive create --config ${GO_VENDOR_TOOLS_FILE} ${SPEC_FILE}; \
+	go_vendor_license \
+		--config $(GO_VENDOR_TOOLS_FILE) \
+		--path $(SPEC_FILE) \
+		report \
+		--verify-spec;