diff --git a/.github/workflows/run-obs.yml b/.github/workflows/run-obs.yml index a14f4efb..bcd493fe 100644 --- a/.github/workflows/run-obs.yml +++ b/.github/workflows/run-obs.yml @@ -10,7 +10,8 @@ on: options: - dms - dms-greeter - - both + - dms-git + - all default: "dms" rebuild_release: description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)" @@ -117,7 +118,7 @@ jobs: echo "has_updates=true" >> $GITHUB_OUTPUT echo "🔄 Manual rebuild requested: $PKG (db$REBUILD)" - elif [[ "$PKG" == "both" ]]; then + elif [[ "$PKG" == "all" ]]; then # Check each stable package and build list of those needing updates PACKAGES_TO_UPDATE=() if check_dms_stable; then @@ -216,7 +217,7 @@ jobs: # Determine version for dms stable and dms-greeter using the API # GITHUB_REF is unreliable when "Use workflow from" a tag; API works from any ref - if [[ "${{ github.event.inputs.package }}" == "dms" ]] || [[ "${{ github.event.inputs.package }}" == "dms-greeter" ]] || [[ "${{ github.event.inputs.package }}" == "both" ]]; then + if [[ "${{ github.event.inputs.package }}" == "dms" ]] || [[ "${{ github.event.inputs.package }}" == "dms-greeter" ]] || [[ "${{ github.event.inputs.package }}" == "all" ]]; then LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "") if [[ -n "$LATEST_TAG" ]]; then echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT @@ -227,10 +228,10 @@ jobs: fi fi - # Use filtered packages from check-updates when package="both" and no rebuild/tag specified - if [[ "${{ github.event.inputs.package }}" == "both" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ ! "${{ github.ref }}" =~ ^refs/tags/ ]]; then + # Use filtered packages from check-updates when package="all" and no rebuild/tag specified + if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ ! "${{ github.ref }}" =~ ^refs/tags/ ]]; then echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT - echo "Manual trigger: both (filtered to: ${{ needs.check-updates.outputs.packages }})" + 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 }}" @@ -387,7 +388,7 @@ jobs: UPLOADED_PACKAGES=() SKIPPED_PACKAGES=() - # PACKAGES can be space-separated list (e.g., "dms dms-greeter" from "both" check) + # PACKAGES can be space-separated list (e.g., "dms dms-greeter" from "all" check) # Loop through each package and upload for PKG in $PACKAGES; do echo "" diff --git a/.github/workflows/run-ppa.yml b/.github/workflows/run-ppa.yml index 2d030eb6..9ba8f621 100644 --- a/.github/workflows/run-ppa.yml +++ b/.github/workflows/run-ppa.yml @@ -10,7 +10,8 @@ on: options: - dms - dms-greeter - - both + - dms-git + - all default: "dms" rebuild_release: description: "Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)" @@ -92,9 +93,10 @@ jobs: echo "has_updates=true" >> $GITHUB_OUTPUT echo "🔄 Manual rebuild requested: $PKG (ppa$REBUILD)" - elif [[ "$PKG" == "both" ]]; then + elif [[ "$PKG" == "all" ]]; then # Check each package and build list of those needing updates PACKAGES_TO_UPDATE=() + check_dms_git && PACKAGES_TO_UPDATE+=("dms-git") check_stable_package "dms" "dms" && PACKAGES_TO_UPDATE+=("dms") check_stable_package "dms-greeter" "danklinux" && PACKAGES_TO_UPDATE+=("dms-greeter") @@ -108,6 +110,15 @@ jobs: echo "✓ All packages up to date" fi + elif [[ "$PKG" == "dms-git" ]]; then + if check_dms_git; then + echo "packages=$PKG" >> $GITHUB_OUTPUT + echo "has_updates=true" >> $GITHUB_OUTPUT + else + echo "packages=" >> $GITHUB_OUTPUT + echo "has_updates=false" >> $GITHUB_OUTPUT + fi + elif [[ "$PKG" == "dms" ]]; then if check_stable_package "dms" "dms"; then echo "packages=$PKG" >> $GITHUB_OUTPUT @@ -204,7 +215,7 @@ jobs: echo "✓ Using rebuild release number: ppa$REBUILD_RELEASE" fi - # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check) + # PACKAGES can be space-separated list (e.g., "dms-git dms dms-greeter" from "all" check) # Loop through each package and upload for PKG in $PACKAGES; do # Map package to PPA name