WIP: testing new publish ci x17

ibois-epfl · Aug 23, 2024 · f362870 · f362870
1 parent c1cbac8
commit f362870
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -64,23 +64,23 @@ 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}) {
               pullRequestReview {
                 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