Use squash for merging PR in publish workflow (#157)

Expensify · Feb 7, 2024 · 1faf919 · 1faf919
1 parent aff1244
commit 1faf919
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -80,14 +80,14 @@ jobs:
                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
            - name: Auto-merge pull request
-             run: gh pr merge --merge --delete-branch ${{ env.BRANCH_NAME }}
+             run: gh pr merge --squash --delete-branch ${{ env.BRANCH_NAME }}
              env:
                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
            - name: Build package
              run: yarn pack
 
            - name: Publish to npm
-             run: yarn publish
+             run: yarn npm publish
              env:
                NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}