From 5d385e7494c5fe938cdee82e7b1251b04ce4d029 Mon Sep 17 00:00:00 2001 From: Preston Date: Thu, 19 Aug 2021 22:23:53 -0400 Subject: [PATCH] Update autoMerge.yml --- .github/workflows/autoMerge.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/autoMerge.yml b/.github/workflows/autoMerge.yml index 390d2f9a..ad16b35e 100644 --- a/.github/workflows/autoMerge.yml +++ b/.github/workflows/autoMerge.yml @@ -15,15 +15,8 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Echo Node ID - run: echo ${{ github.event.pull_request.node_id }} - - name: Enable GitHub Pull Reaquest Auto Merge Action - # You may pin to the exact commit or the version. - # uses: poad/github-pull-request-auto-merge-enable-action@89573fd0a329b987282e63d3a81b1c2d260c6648 - uses: poad/github-pull-request-auto-merge-enable-action@v1.0.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - pull_request_id: ${{ github.event.pull_request.node_id }} - pull_request_number: ${{ github.event.pull_request.number }} - owner: FreeTubeApp - repository: FreeTube + - name: Merge PR + run: | + echo ${{ secrets.PUSH_TOKEN }} >> auth.txt + gh auth login --with-token < auth.txt + gh pr merge https://github.com/FreeTubeApp/FreeTube/pull/${{ github.event.pull_request.number }} --auto