From d2df259897dbefcf8df41f9c9adac9cd9e34aaaa Mon Sep 17 00:00:00 2001 From: phoenix-server Date: Sun, 28 Jun 2026 09:57:44 -0400 Subject: [PATCH] ci: always update lockfile regardless of whether changeset already exists --- .github/workflows/dependabot-changeset.yml | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dependabot-changeset.yml b/.github/workflows/dependabot-changeset.yml index 50662105..8b9bc6cd 100644 --- a/.github/workflows/dependabot-changeset.yml +++ b/.github/workflows/dependabot-changeset.yml @@ -64,16 +64,24 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - CHANGED=false - if [ -n "$(git status --porcelain pnpm-lock.yaml)" ]; then - git add pnpm-lock.yaml - CHANGED=true - fi + ADDED_CHANGESET=false + ADDED_LOCKFILE=false if [ "${{ steps.check.outputs.exists }}" == 'false' ]; then git add ".changeset/dependabot-pr-${{ steps.pr.outputs.number }}.md" - CHANGED=true + ADDED_CHANGESET=true + fi + if [ -n "$(git status --porcelain pnpm-lock.yaml)" ]; then + git add pnpm-lock.yaml + ADDED_LOCKFILE=true fi - if [ "$CHANGED" = true ]; then - git commit -m "chore: add changeset and update lockfile for dependabot PR #${{ steps.pr.outputs.number }}" + if [ "$ADDED_CHANGESET" = true ] || [ "$ADDED_LOCKFILE" = true ]; then + if [ "$ADDED_CHANGESET" = true ] && [ "$ADDED_LOCKFILE" = true ]; then + MSG="chore: add changeset and update lockfile for dependabot PR #${{ steps.pr.outputs.number }}" + elif [ "$ADDED_CHANGESET" = true ]; then + MSG="chore: add changeset for dependabot PR #${{ steps.pr.outputs.number }}" + else + MSG="chore: update lockfile for dependabot PR #${{ steps.pr.outputs.number }}" + fi + git commit -m "$MSG" git push fi