From efe4c14d92c4d2ada2888c6bba1ebe7be101ede1 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Fri, 16 Sep 2022 13:15:09 -0700 Subject: [PATCH] Merge queue prep: admin merge repo-sync prs (#30816) --- .github/workflows/repo-sync.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index ea5a074de5..582dc17acb 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -244,12 +244,13 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} number: ${{ steps.find-pull-request.outputs.number }} - - name: Enable GitHub auto-merge + - name: Admin merge the pull request if: ${{ steps.find-pull-request.outputs.number && steps.pr-files.outputs.count != '0' }} env: GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} - AUTOMERGE_PR_NUMBER: ${{ steps.find-pull-request.outputs.number }} - run: node .github/actions-scripts/enable-automerge.js + PR_NUMBER: ${{ steps.find-pull-request.outputs.number }} + run: | + gh pr merge $PR_NUMBER --admin --merge - name: Send Slack notification if workflow fails uses: someimportantcompany/github-actions-slack-message@f8d28715e7b8a4717047d23f48c39827cacad340