From f3628703a29ed42868c648ff16d8a6e653f7c16f Mon Sep 17 00:00:00 2001
From: Andrea Settimi <andreasettimi39@gmail.com>
Date: Fri, 23 Aug 2024 13:20:37 +0200
Subject: [PATCH] WIP: testing new publish ci x17

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

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 65d6545..6e239b3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -64,7 +64,7 @@ jobs:
 
     - name: Approve pull request
       run: |
-        $pr = gh pr list --head version-sync-branch --json number --jq '.[0].number'
+        $prId = gh pr list --head version-sync-branch --json id --jq '.[0].id'
         gh api graphql -f query='
           mutation($prId: ID!) {
             addPullRequestReview(input: {pullRequestId: $prId, event: APPROVE}) {
@@ -72,15 +72,15 @@ jobs:
                 id
               }
             }
-          }' -f prId=$pr
+          }' -f prId=$prId
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       shell: pwsh
 
     - name: Merge pull request
       run: |
-        $pr = gh pr list --head version-sync-branch --json number --jq '.[0].number'
-        gh pr merge $pr --admin
+        $prId = gh pr list --head version-sync-branch --json id --jq '.[0].id'
+        gh pr merge $prId --squash --delete-branch --admin
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       shell: pwsh