build: improve version tag detection robustness

Makefile:
- Add determine-last-tag function to check if expected previous tag exists
- Fall back to latest stable tag if expected tag not found
- Pass current version as expected previous tag to bump-version targets

build-rpm.yml:
- Extract base version from pre-release tags (e.g., v0.5.0-alpha -> v0.5.0)
- Check if stable version tag exists before finding previous tag
- Add informative logging for tag detection process
- Fall back to most recent stable tag when needed

Author: imlk0

.github/workflows/build-rpm.yml

@@ -219,14 +219,33 @@ jobs:
         id: generate-notes
         run: |
           CURRENT_TAG="${{ github.ref_name }}"
-          # Get the previous stable tag (excluding alpha/beta/rc suffixes)
-          # Filter tags matching vX.Y.Z pattern (no suffix like -alpha, -beta, -rc)
-          PREV_TAG=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -A1 "^${CURRENT_TAG}$" | tail -n1)
-          if [ -z "$PREV_TAG" ] || [ "$PREV_TAG" = "$CURRENT_TAG" ]; then
-            PREV_TAG=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -2 | tail -n1)
+          echo "Current tag: $CURRENT_TAG"
+          
+          # Extract version number from current tag (e.g., v0.5.0-alpha -> v0.5.0)
+          CURRENT_VERSION=$(echo "$CURRENT_TAG" | grep -oE '^v[0-9]+\.[0-9]+\.[0-9]+')
+          echo "Current version: $CURRENT_VERSION"
+          
+          # Get all stable tags sorted by version
+          STABLE_TAGS=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')
+          echo "Stable tags:"
+          echo "$STABLE_TAGS" | head -5
+          
+          # Check if the stable version of current tag exists
+          if echo "$STABLE_TAGS" | grep -q "^${CURRENT_VERSION}$"; then
+            echo "Found stable version $CURRENT_VERSION, finding previous tag"
+            # Use the stable version as reference, find the one before it
+            PREV_TAG=$(echo "$STABLE_TAGS" | grep -A1 "^${CURRENT_VERSION}$" | tail -n1)
+          else
+            echo "Stable version not found, using most recent stable tag"
+            # Current tag is pre-release, find the most recent stable tag
+            PREV_TAG=$(echo "$STABLE_TAGS" | head -1)
           fi
           
-          echo "Current tag: $CURRENT_TAG"
+          # Fallback: if still no prev tag, use the most recent stable tag
+          if [ -z "$PREV_TAG" ] || [ "$PREV_TAG" = "$CURRENT_VERSION" ]; then
+            echo "Fallback: using most recent stable tag"
+            PREV_TAG=$(echo "$STABLE_TAGS" | head -1)
+          fi
           echo "Previous tag: $PREV_TAG"
           
           # Generate changelog with commit hashes

Makefile

@@ -210,11 +210,20 @@ define update-cargo-lock
 endef
 
 # Function to get git info
+# $(1) = expected previous version tag (e.g., v0.4.0)
 define get-git-info
-	$(eval LAST_TAG := $(shell git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' | head -1))
+	$(eval EXPECTED_PREV_TAG := v$(shell echo $(1) | awk -F. '{print $$1"."$$2".0"}'))
 	$(eval AUTHOR := $(shell git log -1 --pretty=format:"%an <%ae>"))
 endef
 
+# Function to determine last tag
+# $(1) = expected previous version tag (e.g., v0.4.0)
+define determine-last-tag
+	$(eval EXPECTED_TAG := $(1))
+	$(eval TAG_EXISTS := $(shell git tag -l "$(EXPECTED_TAG)"))
+	$(eval LAST_TAG := $(if $(TAG_EXISTS),$(EXPECTED_TAG),$(shell git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' | head -1)))
+endef
+
 # Function to write commits to file for RPM (uses -)
 define write-commits-to-file
 	@git log $(LAST_TAG)..HEAD --pretty=format:"- %s" --no-merges > $(1) 2>/dev/null || echo "- Version bump to $(2)" > $(1)
@@ -255,13 +264,17 @@ define update-debian-changelog
 endef
 
 # Main bump version function
+# $(1) = version type (major/minor/patch)
+# $(2) = new version number
+# $(3) = expected previous version tag (e.g., v0.4.0)
 define bump-version-internal
 	@echo "Bumping $(1) version: $(CURRENT_VERSION) -> $(2)"
 	$(call update-cargo-toml,$(2))
 	@echo "New version: $(2)"
 	$(call update-cargo-lock)
 	$(call get-git-info,$(2))
-	@echo "Last tag: $(LAST_TAG)"
+	$(call determine-last-tag,$(3))
+	@echo "Using last tag: $(LAST_TAG)"
 	@echo "Updating RPM spec version and changelog..."
 	$(call update-rpm-spec,$(2))
 	@echo "Updating Debian changelog..."
@@ -270,7 +283,7 @@ define bump-version-internal
 	@echo "Changes made:"
 	@echo "  - Updated Cargo.toml"
 	@echo "  - Updated Cargo.lock"
-	@echo "  - Updated RPM spec changelog"
+	@echo "  - Updated RPM spec version and changelog"
 	@echo "  - Updated Debian changelog"
 	@echo ""
 	@echo "If it is ok to commit, run the following commands:"
@@ -283,15 +296,15 @@ endef
 # Bump major version (0.4.1 -> 1.0.0)
 .PHONY: bump-version-major
 bump-version-major:
-	$(call bump-version-internal,major,$(NEW_VERSION_MAJOR))
+	$(call bump-version-internal,major,$(NEW_VERSION_MAJOR),v$(CURRENT_VERSION))
 
 # Bump minor version (0.4.1 -> 0.5.0)
 .PHONY: bump-version-minor
 bump-version-minor:
-	$(call bump-version-internal,minor,$(NEW_VERSION_MINOR))
+	$(call bump-version-internal,minor,$(NEW_VERSION_MINOR),v$(CURRENT_VERSION))
 
 # Bump patch version (0.4.1 -> 0.4.2)
 .PHONY: bump-version-patch
 bump-version-patch:
-	$(call bump-version-internal,patch,$(NEW_VERSION_PATCH))
+	$(call bump-version-internal,patch,$(NEW_VERSION_PATCH),v$(CURRENT_VERSION))