From c2c90c680e4ce7c2ec9caae52ab3c069ac7bbebe Mon Sep 17 00:00:00 2001 From: purian23 Date: Mon, 15 Dec 2025 01:28:00 -0500 Subject: [PATCH] distro: OBS edgecase --- .github/workflows/run-obs.yml | 10 ++++++++-- distro/scripts/obs-upload.sh | 7 ++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-obs.yml b/.github/workflows/run-obs.yml index 8104bed4..d22ed3c3 100644 --- a/.github/workflows/run-obs.yml +++ b/.github/workflows/run-obs.yml @@ -169,8 +169,14 @@ jobs: echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT echo "Triggered by schedule: updating git package" elif [[ -n "${{ github.event.inputs.package }}" ]]; then - echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT - echo "Manual trigger: ${{ github.event.inputs.package }}" + # Use filtered packages from check-updates when package="all" and no rebuild requested + if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]]; then + echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT + echo "Manual trigger: all (filtered to: ${{ needs.check-updates.outputs.packages }})" + else + echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT + echo "Manual trigger: ${{ github.event.inputs.package }}" + fi else echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT fi diff --git a/distro/scripts/obs-upload.sh b/distro/scripts/obs-upload.sh index 9068ad3a..b62913d4 100755 --- a/distro/scripts/obs-upload.sh +++ b/distro/scripts/obs-upload.sh @@ -345,11 +345,8 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]]; fi else echo " - Detected same version $NEW_VERSION (release $OLD_RELEASE). No changes needed, skipping update." - # If this is OpenSUSE only run, we can exit. - if [[ "$UPLOAD_DEBIAN" == false ]]; then - echo "✅ No changes needed for OpenSUSE. Exiting." - exit 0 - fi + echo "✅ No changes needed for this package. Exiting gracefully." + exit 0 fi else echo " - New version detected: $OLD_VERSION -> $NEW_VERSION (keeping release $NEW_RELEASE)"