From 887c2971ebf54b341d11f1f366b9a4041dbb40a7 Mon Sep 17 00:00:00 2001
From: Robert Kozik <robert.kozik@swmansion.com>
Date: Wed, 7 Feb 2024 20:47:04 +0100
Subject: [PATCH] use squash for merging PR in publish workflow

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0c87f364..e874bd35 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -80,7 +80,7 @@ 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 }}
 
@@ -88,6 +88,6 @@ jobs:
              run: yarn pack
 
            - name: Publish to npm
-             run: yarn publish
+             run: yarn npm publish
              env:
                NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}