ci: simplified packaging PR process

trailheadapps · Aug 3, 2023 · e1bb2fc · e1bb2fc
1 parent 3b845dc
commit e1bb2fc
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -121,12 +121,14 @@ jobs:
                   branch: 'auto/package-version-${{ steps.createPackageVersion.outputs.packageVersionId }}'
                   token: ${{ secrets.BOT_ACCESS_TOKEN }}
 
-            # Approve pull request
-            - name: 'Approve Pull Request'
-              uses: juliangruber/approve-pull-request-action@v2
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  number: ${{ steps.create-pr.outputs.pull-request-number }}
+            # Approve and mark PR for auto merge
+            - name: 'Approve and mark PR for auto merge'
+              run: |
+                  gh pr review --approve "$PR_NUMBER"
+                  gh pr merge --auto --squash "$PR_NUMBER"
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  PR_NUMBER: ${{ steps.create-pr.outputs.pull-request-number }}
 
             # Housekeeping
             - name: 'Delete scratch org'