From 42cc88ca655bb086622944075cd9243d503aeb6e Mon Sep 17 00:00:00 2001
From: purian23 <purian23@gmail.com>
Date: Mon, 15 Dec 2025 23:24:16 -0500
Subject: [PATCH] Workflow update

---
 .github/workflows/run-obs.yml | 11 ++++++++++-
 distro/scripts/obs-upload.sh  | 12 ++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-obs.yml b/.github/workflows/run-obs.yml
index 1d9bf104..c12e5ea3 100644
--- a/.github/workflows/run-obs.yml
+++ b/.github/workflows/run-obs.yml
@@ -18,6 +18,8 @@ on:
   push:
     tags:
       - "v*"
+    branches:
+      - master
   schedule:
     - cron: "0 */3 * * *" # Every 3 hours for dms-git builds
 
@@ -265,10 +267,15 @@ jobs:
         run: |
           VERSION="${{ steps.packages.outputs.version }}"
           VERSION_NO_V="${VERSION#v}"
-          echo "Updating packaging to version $VERSION_NO_V"
+          echo "==> Updating packaging files to version: $VERSION_NO_V"
 
+          # Update spec file
           sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
 
+          # Verify the update
+          UPDATED_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1)
+          echo "✓ Spec file now shows Version: $UPDATED_VERSION"
+
           # Single changelog entry (full history on OBS website)
           DATE_STR=$(date "+%a %b %d %Y")
           LOCAL_SPEC_HEAD=$(sed -n '1,/%changelog/{ /%changelog/d; p }' distro/opensuse/dms.spec)
@@ -328,6 +335,7 @@ jobs:
       - name: Upload to OBS
         env:
           REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
+          TAG_VERSION: ${{ steps.packages.outputs.version }}
         run: |
           PACKAGES="${{ steps.packages.outputs.packages }}"
 
@@ -339,6 +347,7 @@ jobs:
           MESSAGE="Automated update from GitHub Actions"
           if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
             MESSAGE="Update to ${{ steps.packages.outputs.version }}"
+            echo "==> Version being uploaded: ${{ steps.packages.outputs.version }}"
           fi
 
           # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check)
diff --git a/distro/scripts/obs-upload.sh b/distro/scripts/obs-upload.sh
index 869b106e..a2aef3a5 100755
--- a/distro/scripts/obs-upload.sh
+++ b/distro/scripts/obs-upload.sh
@@ -307,12 +307,16 @@ if [[ -d "distro/debian/$PACKAGE/debian" ]]; then
         else
             # Rebuild number specified - check if this exact version already exists (exact mode)
             if check_obs_version_exists "$OBS_PROJECT" "$PACKAGE" "$CHANGELOG_VERSION" "exact"; then
-                echo "==> Error: Version $CHANGELOG_VERSION already exists in OBS"
+                echo "==> Version $CHANGELOG_VERSION already exists in OBS"
                 echo "    This exact version (including db${REBUILD_RELEASE}) is already uploaded."
-                echo "    To rebuild with a different release number, try incrementing:"
+                echo "    Skipping upload - nothing to do."
+                echo ""
+                echo "    💡 To rebuild with a different release number, try incrementing:"
                 NEXT_NUM=$((REBUILD_RELEASE + 1))
-                echo "      ./distro/scripts/obs-upload.sh $PACKAGE $NEXT_NUM"
-                exit 1
+                echo "       REBUILD_RELEASE=$NEXT_NUM"
+                echo ""
+                echo "✓ Exiting gracefully (no changes needed)"
+                exit 0
             fi
         fi
     fi