Update rebuild logic on automation to obs / ppa

distro/scripts/obs-upload.sh

@@ -139,6 +139,20 @@ esac
 OBS_PROJECT="${OBS_BASE_PROJECT}:${PROJECT}"
 
 echo "==> Target: $OBS_PROJECT / $PACKAGE"
+
+# Detect if this is a manual run or automated
+IS_MANUAL=false
+if [[ -n "${REBUILD_RELEASE:-}" ]]; then
+    IS_MANUAL=true
+    echo "==> Manual rebuild detected (REBUILD_RELEASE=$REBUILD_RELEASE)"
+elif [[ -n "${FORCE_REBUILD:-}" ]] && [[ "${FORCE_REBUILD}" == "true" ]]; then
+    IS_MANUAL=true
+    echo "==> Manual workflow trigger detected (FORCE_REBUILD=true)"
+elif [[ -z "${GITHUB_ACTIONS:-}" ]] && [[ -z "${CI:-}" ]]; then
+    IS_MANUAL=true
+    echo "==> Local/manual run detected (not in CI)"
+fi
+
 if [[ "$UPLOAD_DEBIAN" == true && "$UPLOAD_OPENSUSE" == true ]]; then
     echo "==> Distributions: Debian + OpenSUSE"
 elif [[ "$UPLOAD_DEBIAN" == true ]]; then
@@ -192,9 +206,20 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]];
         if [[ "$NEW_VERSION" == "$OLD_VERSION" ]]; then
             if [[ "$OLD_RELEASE" =~ ^([0-9]+) ]]; then
                 BASE_RELEASE="${BASH_REMATCH[1]}"
+                if [[ "$IS_MANUAL" == true ]]; then
                     NEXT_RELEASE=$((BASE_RELEASE + 1))
                     echo "  - Detected rebuild of same version $NEW_VERSION (release $OLD_RELEASE -> $NEXT_RELEASE)"
                     sed -i "s/^Release:[[:space:]]*${NEW_RELEASE}%{?dist}/Release:        ${NEXT_RELEASE}%{?dist}/" "$WORK_DIR/$PACKAGE.spec"
+                else
+                    echo "  - Detected same version $NEW_VERSION (release $OLD_RELEASE). Not a manual run, skipping update."
+                    # For automated runs with no version change, we should stop here to avoid unnecessary rebuilds
+                    # However, we need to check if we are also updating Debian, or if this script is expected to continue.
+                    # If this is OpenSUSE only run, we can exit.
+                    if [[ "$UPLOAD_DEBIAN" == false ]]; then
+                         echo "✅ No changes needed for OpenSUSE (not manual). Exiting."
+                         exit 0
+                    fi
+                fi
             fi
         else
             echo "  - New version detected: $OLD_VERSION -> $NEW_VERSION (keeping release $NEW_RELEASE)"
@@ -643,7 +668,8 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
     CHANGELOG_BASE=$(echo "$CHANGELOG_VERSION" | sed 's/ppa[0-9]*$//')
     OLD_DSC_BASE=$(echo "$OLD_DSC_VERSION" | sed 's/ppa[0-9]*$//')
 
-    if [[ -n "$OLD_DSC_VERSION" ]] && [[ "$OLD_DSC_BASE" == "$CHANGELOG_BASE" ]] && [[ "$IS_MANUAL" == true ]]; then
+    if [[ -n "$OLD_DSC_VERSION" ]] && [[ "$OLD_DSC_BASE" == "$CHANGELOG_BASE" ]]; then
+        if [[ "$IS_MANUAL" == true ]]; then
             echo "==> Detected rebuild of same base version $CHANGELOG_BASE, incrementing version"
         
             if [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git$ ]]; then
@@ -800,18 +826,24 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
                                     rm -rf "$EXTRACT_DIR"
                                     exit 1
                                 fi
-                        else
-                            echo "  Error: No existing tarball found to extract"
-                            exit 1
                             fi
                         fi
                     fi
                 fi
+                
+                rm -f "$WORK_DIR/$COMBINED_TARBALL"
+                
+                echo "    Creating combined tarball: $COMBINED_TARBALL"
                 cd "$(dirname "$SOURCE_DIR")"
                 TARBALL_BASE=$(basename "$SOURCE_DIR")
                 tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$COMBINED_TARBALL" "$TARBALL_BASE"
-            cd "$WORK_DIR"
-            
+                cd "$REPO_ROOT"
+            fi
+        else
+            echo "==> Detected same version. Not a manual run, skipping Debian version increment."
+            echo "✅ No changes needed for Debian. Exiting."
+            exit 0
+        fi    
             TARBALL_SIZE=$(stat -c%s "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null || stat -f%z "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null)
             TARBALL_MD5=$(md5sum "$WORK_DIR/$COMBINED_TARBALL" | cut -d' ' -f1)
             
@@ -852,10 +884,7 @@ Files:
  $TARBALL_MD5 $TARBALL_SIZE $COMBINED_TARBALL
 EOF
             echo "  - Updated changelog and recreated tarball with version $NEW_VERSION"
-        else
-            echo "  Error: Source directory not found, cannot recreate tarball"
-            exit 1
-        fi
+
     fi
 fi
 

distro/scripts/ppa-build.sh

@@ -103,6 +103,22 @@ if [ "$CHANGELOG_SERIES" != "$UBUNTU_SERIES" ] && [ "$CHANGELOG_SERIES" != "UNRE
     warn "Consider updating changelog with: dch -r '' -D $UBUNTU_SERIES"
 fi
 
+# Check if this is a manual run or automated
+IS_MANUAL=false
+if [[ -n "${REBUILD_RELEASE:-}" ]]; then
+    IS_MANUAL=true
+    echo "==> Manual rebuild detected (REBUILD_RELEASE=$REBUILD_RELEASE)"
+elif [[ -n "${FORCE_REBUILD:-}" ]] && [[ "${FORCE_REBUILD}" == "true" ]]; then
+    IS_MANUAL=true
+    echo "==> Manual workflow trigger detected (FORCE_REBUILD=true)"
+elif [[ "${GITHUB_EVENT_NAME:-}" == "workflow_dispatch" ]]; then
+    IS_MANUAL=true
+    echo "==> Manual workflow trigger detected (workflow_dispatch)"
+elif [[ -z "${GITHUB_ACTIONS:-}" ]] && [[ -z "${CI:-}" ]]; then
+    IS_MANUAL=true
+    echo "==> Local/manual run detected (not in CI)"
+fi
+
 # Detect package type and update version automatically
 cd "$PACKAGE_DIR"
 
@@ -274,7 +290,13 @@ if [ "$IS_GIT_PACKAGE" = true ] && [ -n "$GIT_REPO" ]; then
         ESCAPED_BASE=$(echo "$BASE_VERSION" | sed 's/\./\\./g' | sed 's/+/\\+/g')
         if [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
             PPA_NUM=$((BASH_REMATCH[1] + 1))
+            if [[ "$IS_MANUAL" == true ]]; then
                 info "Detected rebuild of same commit (current: $CURRENT_VERSION), incrementing PPA number to $PPA_NUM"
+            else
+                info "Detected rebuild of same commit (current: $CURRENT_VERSION). Not a manual run, skipping."
+                success "No changes needed (commit matches)."
+                exit 0
+            fi
         else
             info "New commit or first build, using PPA number $PPA_NUM"
         fi
@@ -427,7 +449,13 @@ elif [ -n "$GIT_REPO" ]; then
             ESCAPED_BASE=$(echo "$BASE_VERSION" | sed 's/\./\\./g' | sed 's/-/\\-/g')
             if [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
                 PPA_NUM=$((BASH_REMATCH[1] + 1))
+                if [[ "$IS_MANUAL" == true ]]; then
                     info "Detected rebuild of same version (current: $CURRENT_VERSION), incrementing PPA number to $PPA_NUM"
+                else
+                    info "Detected rebuild of same version (current: $CURRENT_VERSION). Not a manual run, skipping."
+                    success "No changes needed (version matches)."
+                    exit 0
+                fi
             else
                 info "New version or first build, using PPA number $PPA_NUM"
             fi

distro/scripts/ppa-upload.sh

@@ -84,8 +84,9 @@ fi
 CHANGES_FILE=$(find "$PARENT_DIR" -maxdepth 1 -name "${PACKAGE_NAME}_*_source.changes" -type f | sort -V | tail -1)
 
 if [ -z "$CHANGES_FILE" ]; then
-    error "Changes file not found in $PARENT_DIR"
-    exit 1
+    warn "Changes file not found in $PARENT_DIR"
+    warn "Assuming build was skipped (no changes needed) and exiting successfully."
+    exit 0
 fi
 
 info "Found changes file: $CHANGES_FILE"