Well that does not work. Try shell with gh

briandfoy · Aug 24, 2023 · 87a7312 · 87a7312
1 parent cd9908c
commit 87a7312
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
diff --git a/.github/workflows/update_range_message.yml b/.github/workflows/update_range_message.yml
@@ -66,6 +66,7 @@ jobs:
                 git commit -m "RangeMessage.xml for ${{ env.NEW_VERSION }}" lib/Business/ISBN/RangeMessage.xml lib/Business/ISBN/Data.pm
                 echo "CHANGES_PUSHED=1" >> $GITHUB_ENV
             - name: Create Pull Request
+              id: pull-request
               if: ${{ env.CHANGES_PUSHED == 1 }}
               uses: peter-evans/create-pull-request@v4
               with:
@@ -76,6 +77,16 @@ jobs:
                 delete-branch: true
                 branch: ${{env.PR_BRANCH_NAME}}
                 base: master
+            - name: Merge the pull request
+              if: ${{ env.CHANGES_PUSHED == 1 }}
+              env:
+                GH_TOKEN: ${{ secrets.ISSUES_GITHUB_TOKEN }}
+              shell: bash
+              run: |
+                echo "Approving pull request <${{ steps.pull-request.outputs.pull-request-number }}>"
+                gh pr review --approve ${{ steps.pull-request.outputs.pull-request-number }}
+                echo "Merging pull request <${{ steps.pull-request.outputs.pull-request-number }}>"
+                gh pr merge ${{  steps.pull-request.outputs.pull-request-number }} --admin --squash
             - name: Clean up
               continue-on-error: true
               if: ${{ env.RANGE_MESSAGES_SAME == 0 }}