diff --git a/.github/workflows/run-obs.yml b/.github/workflows/run-obs.yml index 1b96d544..a14f4efb 100644 --- a/.github/workflows/run-obs.yml +++ b/.github/workflows/run-obs.yml @@ -9,9 +9,8 @@ on: type: choice options: - dms - - dms-git - dms-greeter - - all + - both default: "dms" rebuild_release: description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)" @@ -118,10 +117,9 @@ jobs: echo "has_updates=true" >> $GITHUB_OUTPUT echo "🔄 Manual rebuild requested: $PKG (db$REBUILD)" - elif [[ "$PKG" == "all" ]]; then - # Check each package and build list of those needing updates + elif [[ "$PKG" == "both" ]]; then + # Check each stable package and build list of those needing updates PACKAGES_TO_UPDATE=() - check_dms_git && PACKAGES_TO_UPDATE+=("dms-git") if check_dms_stable; then PACKAGES_TO_UPDATE+=("dms") if [[ -n "$LATEST_TAG" ]]; then @@ -140,7 +138,7 @@ jobs: else echo "packages=" >> $GITHUB_OUTPUT echo "has_updates=false" >> $GITHUB_OUTPUT - echo "✓ All packages up to date" + echo "✓ Both packages up to date" fi elif [[ "$PKG" == "dms-git" ]]; then @@ -218,7 +216,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 }}" == "all" ]]; then + if [[ "${{ github.event.inputs.package }}" == "dms" ]] || [[ "${{ github.event.inputs.package }}" == "dms-greeter" ]] || [[ "${{ github.event.inputs.package }}" == "both" ]]; 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 @@ -229,10 +227,10 @@ jobs: fi fi - # 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 + # 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 echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT - echo "Manual trigger: all (filtered to: ${{ needs.check-updates.outputs.packages }})" + echo "Manual trigger: both (filtered to: ${{ needs.check-updates.outputs.packages }})" else echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT echo "Manual trigger: ${{ github.event.inputs.package }}" @@ -245,7 +243,7 @@ jobs: fi - name: Update dms-git spec version - if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all' + if: contains(steps.packages.outputs.packages, 'dms-git') run: | COMMIT_HASH=$(git rev-parse --short=8 HEAD) COMMIT_COUNT=$(git rev-list --count HEAD) @@ -266,7 +264,7 @@ jobs: } > distro/opensuse/dms-git.spec - name: Update Debian dms-git changelog version - if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all' + if: contains(steps.packages.outputs.packages, 'dms-git') run: | COMMIT_HASH=$(git rev-parse --short=8 HEAD) COMMIT_COUNT=$(git rev-list --count HEAD) @@ -389,7 +387,7 @@ jobs: UPLOADED_PACKAGES=() SKIPPED_PACKAGES=() - # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check) + # PACKAGES can be space-separated list (e.g., "dms dms-greeter" from "both" 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 00d5880f..2d030eb6 100644 --- a/.github/workflows/run-ppa.yml +++ b/.github/workflows/run-ppa.yml @@ -4,9 +4,14 @@ on: workflow_dispatch: inputs: package: - description: "Package to upload (dms, dms-git, dms-greeter, or all)" - required: false - default: "dms-git" + description: "Package to upload" + required: true + type: choice + options: + - dms + - dms-greeter + - both + default: "dms" rebuild_release: description: "Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)" required: false @@ -87,10 +92,9 @@ jobs: echo "has_updates=true" >> $GITHUB_OUTPUT echo "🔄 Manual rebuild requested: $PKG (ppa$REBUILD)" - elif [[ "$PKG" == "all" ]]; then + elif [[ "$PKG" == "both" ]]; 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") @@ -104,15 +108,6 @@ 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 @@ -139,7 +134,7 @@ jobs: fi else # Fallback - echo "packages=dms-git" >> $GITHUB_OUTPUT + echo "packages=dms" >> $GITHUB_OUTPUT echo "has_updates=true" >> $GITHUB_OUTPUT fi diff --git a/distro/debian/dms-greeter/_service b/distro/debian/dms-greeter/_service index d201d1d9..80d5679e 100644 --- a/distro/debian/dms-greeter/_service +++ b/distro/debian/dms-greeter/_service @@ -3,7 +3,7 @@ https github.com - /AvengeMedia/DankMaterialShell/releases/download/v1.4.2/dms-qml.tar.gz + /AvengeMedia/DankMaterialShell/releases/download/v1.4.3/dms-qml.tar.gz dms-qml.tar.gz diff --git a/distro/debian/dms-greeter/debian/changelog b/distro/debian/dms-greeter/debian/changelog index 1cfa0a17..5115451d 100644 --- a/distro/debian/dms-greeter/debian/changelog +++ b/distro/debian/dms-greeter/debian/changelog @@ -1,6 +1,5 @@ -dms-greeter (1.4.2db8) unstable; urgency=medium +dms-greeter (1.4.3db1) unstable; urgency=medium - * Initial Debian OBS package - * Port from Ubuntu/Fedora packaging + * Update to v1.4.3 stable release - -- Avenge Media Sat, 21 Feb 2026 00:00:00 +0000 + -- Avenge Media Tue, 25 Feb 2026 02:40:00 +0000 diff --git a/distro/scripts/obs-upload.sh b/distro/scripts/obs-upload.sh index 5c3e9d94..24ad009d 100755 --- a/distro/scripts/obs-upload.sh +++ b/distro/scripts/obs-upload.sh @@ -419,6 +419,9 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]]; sed -i "s/VERSION_PLACEHOLDER/${DMS_GREETER_BASE_VERSION}/g" "$WORK_DIR/$PACKAGE.spec" sed -i "s/RELEASE_PLACEHOLDER/${DMS_GREETER_RELEASE}/g" "$WORK_DIR/$PACKAGE.spec" sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" "$WORK_DIR/$PACKAGE.spec" + # Explicitly set Version:/Release: in case the spec uses %{version} macro + sed -i "s/^Version:.*/Version: ${DMS_GREETER_BASE_VERSION}/" "$WORK_DIR/$PACKAGE.spec" + sed -i "s/^Release:.*/Release: ${DMS_GREETER_RELEASE}%{?dist}/" "$WORK_DIR/$PACKAGE.spec" fi if [[ -f "$WORK_DIR/.osc/$PACKAGE.spec" ]]; then @@ -813,6 +816,9 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ -d "distro/debian/$PACKAGE/debian" ]]; t sed -i "s/VERSION_PLACEHOLDER/${DMS_GREETER_BASE_VERSION}/g" "$WORK_DIR/$PACKAGE.spec" sed -i "s/RELEASE_PLACEHOLDER/${DMS_GREETER_RELEASE}/g" "$WORK_DIR/$PACKAGE.spec" sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" "$WORK_DIR/$PACKAGE.spec" + # Explicitly set Version:/Release: in case the spec uses %{version} macro + sed -i "s/^Version:.*/Version: ${DMS_GREETER_BASE_VERSION}/" "$WORK_DIR/$PACKAGE.spec" + sed -i "s/^Release:.*/Release: ${DMS_GREETER_RELEASE}%{?dist}/" "$WORK_DIR/$PACKAGE.spec" fi fi