diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 6ef722b..bf3267a 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -19,6 +19,9 @@ jobs: steps: - uses: actions/checkout@v4 + with: + # Fetch the last 2 commits instead of just 1. (Fetching just 1 commit would overwrite the whole history) + fetch-depth: 2 - name: Use Node.js (22.x) uses: actions/setup-node@v4 with: @@ -27,10 +30,20 @@ jobs: cache: 'npm' - run: npm ci - run: npm run bump + - name: Get last commit message + id: last-commit + run: | + echo "message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT + echo "author=$(git log -1 --pretty=\"%an <%ae>\")" >> $GITHUB_OUTPUT # Commit changes to package.json back to the repository - uses: stefanzweifel/git-auto-commit-action@v5 with: + commit_author: ${{ steps.last-commit.outputs.author }} file_pattern: 'package.json' + commit_message: ${{ steps.last-commit.outputs.message }} + commit_options: '--amend --no-edit' + push_options: '--force' + skip_fetch: true - run: npm publish --access public --loglevel verbose --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}