From e005f2164e87298d65e32d560e89b6afe8d18114 Mon Sep 17 00:00:00 2001 From: "Brett T. Warden" Date: Wed, 30 Apr 2025 13:27:54 -0700 Subject: [PATCH] Make catchup- a little bit more flexible with tag names We support tag names like ${package}-${version} ${package}-v${version} ${version} v${version} Now add support for things like ${package}-foo-bar-${version} foo-bar-${version} for example: vulkan-sdk-1.3.275.0 for SPIRV-Headers --- Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 1c18b13..86a8ebb 100644 --- a/Makefile.common +++ b/Makefile.common @@ -610,7 +610,7 @@ catchup-%: fi; \ version=$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1); \ echo "Version: $${version}"; \ - current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?v?$${version}$$") || { \ + current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?(.+-|v)?$${version}$$") || { \ echo "Error: No tag found for current package version"; \ exit 1; \ }; \