Merge pull request #9034 from Expensify/chirag-merge-with-pr-number

Providing PR number while merging
Expensify · May 16, 2022 · 5461952 · 5461952
2 parents 82b97bf + 40064a7
commit 5461952
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
@@ -205,7 +205,7 @@ jobs:
       - name: Auto-merge the PR
         # Important: only auto-merge if there was no merge conflict and the PR is mergable (not blocked by a missing status check)!
         if: ${{ fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) && fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }}
-        run: gh pr merge --merge --delete-branch || sleep 5 && gh pr merge --merge --delete-branch
+        run: gh pr merge ${{ steps.createPullRequest.outputs.pr_number }} --merge --delete-branch
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 

diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml
@@ -129,7 +129,7 @@ jobs:
         run: exit 1
 
       - name: Auto-merge the PR
-        run: gh pr merge --merge --delete-branch || sleep 5 && gh pr merge --merge --delete-branch
+        run: gh pr merge ${{ steps.createPullRequest.outputs.PR_NUMBER }} --merge --delete-branch
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}