1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 13:32:50 -05:00

distro: Reformat workflow newlines

This commit is contained in:
purian23
2025-12-12 23:35:37 -05:00
parent 5fda6e0f12
commit 44f6ab4878
2 changed files with 24 additions and 9 deletions

View File

@@ -309,7 +309,7 @@ jobs:
# Get list of changed packages for commit message
CHANGED_DEB=$(git diff --name-only distro/debian/ 2>/dev/null | grep 'debian/changelog' | xargs dirname 2>/dev/null | xargs dirname 2>/dev/null | xargs basename 2>/dev/null | tr '\n' ', ' | sed 's/, $//' || echo "")
CHANGED_SUSE=$(git diff --name-only distro/opensuse/ 2>/dev/null | grep '\.spec$' | sed 's|distro/opensuse/||' | sed 's/\.spec$//' | tr '\n' ', ' | sed 's/, $//' || echo "")
PKGS=$(echo "$CHANGED_DEB,$CHANGED_SUSE" | tr ',' '\n' | grep -v '^$' | sort -u | tr '\n' ',' | sed 's/,$//')
echo "packages=$PKGS" >> $GITHUB_OUTPUT
echo "📋 Changed packages: $PKGS"
@@ -338,7 +338,10 @@ jobs:
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "ci: Auto-update OBS packages [${{ steps.changed-packages.outputs.packages }}]"
commit-message: |
ci: Auto-update OBS packages [${{ steps.changed-packages.outputs.packages }}]
🤖 Automated by GitHub Actions
title: "ci: Auto-update OBS packages [${{ steps.changed-packages.outputs.packages }}]"
body: ${{ steps.pr-body.outputs.body }}
branch: ci/obs-package-update
@@ -346,9 +349,7 @@ jobs:
labels: |
automated
ci
path: |
distro/debian/
distro/opensuse/
path: distro/debian/ distro/opensuse/
- name: Summary
run: |

View File

@@ -176,7 +176,7 @@ jobs:
PPA_NAME="$PACKAGES"
;;
esac
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
echo "Uploading $PACKAGES to PPA..."
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
@@ -192,12 +192,23 @@ jobs:
echo "📋 No changelog changes to commit"
else
echo "has_changes=true" >> $GITHUB_OUTPUT
# Get list of changed packages for commit message
CHANGED=$(git diff --name-only distro/ubuntu/ | grep 'debian/changelog' | xargs dirname | xargs -I{} basename {} | tr '\n' ',' | sed 's/,$//')
# Get list of changed packages for commit message (deduplicate)
CHANGED=$(git diff --name-only distro/ubuntu/ | grep 'debian/changelog' | xargs -I{} dirname {} | xargs -I{} basename {} | sort -u | tr '\n' ',' | sed 's/,$//')
echo "packages=$CHANGED" >> $GITHUB_OUTPUT
echo "📋 Changed packages: $CHANGED"
echo "📋 Debug - Changed files:"
git diff --name-only distro/ubuntu/ | grep 'debian/changelog' || echo "No changelog files found"
fi
- name: Debug - Show changes before PR
if: steps.changed-packages.outputs.has_changes == 'true'
run: |
echo "📋 Checking git status:"
git status --short distro/ubuntu/ || true
echo ""
echo "📋 Checking git diff:"
git diff --stat distro/ubuntu/ || true
- name: Prepare PR body
if: steps.changed-packages.outputs.has_changes == 'true'
id: pr-body
@@ -218,7 +229,10 @@ jobs:
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "ci: Auto-update PPA packages [${{ steps.changed-packages.outputs.packages }}]"
commit-message: |
ci: Auto-update PPA packages [${{ steps.changed-packages.outputs.packages }}]
🤖 Automated by GitHub Actions
title: "ci: Auto-update PPA packages [${{ steps.changed-packages.outputs.packages }}]"
body: ${{ steps.pr-body.outputs.body }}
branch: ci/ppa-changelog-update