From 36f443d6350e86168e4b4d96498a6d5495cd4d34 Mon Sep 17 00:00:00 2001 From: Francisco Hodge Date: Thu, 12 Aug 2021 20:58:47 -0700 Subject: [PATCH] Update workflow --- .github/workflows/publish.yml | 4 ++++ .github/workflows/pull_request_dependabot.yml | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d7c5dba2..3555615f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,6 +4,10 @@ on: push: branches: - master + paths-ignore: + - README.md + - .gitignore + - .github/** jobs: publish: diff --git a/.github/workflows/pull_request_dependabot.yml b/.github/workflows/pull_request_dependabot.yml index 8325de1c..4146e2e9 100644 --- a/.github/workflows/pull_request_dependabot.yml +++ b/.github/workflows/pull_request_dependabot.yml @@ -26,10 +26,19 @@ jobs: CI: true - name: Merge PR if: success() - uses: "pascalgn/automerge-action@v0.14.2" - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_LABELS: "dependencies" + uses: "actions/github-script@v2" + with: + github-token: "${{ secrets.GH_KEY }}" + script: | + const pullRequest = context.payload.pull_request + const repository = context.repo + + await github.pulls.merge({ + merge_method: "merge", + owner: repository.owner, + pull_number: pullRequest.number, + repo: repository.repo, + }) - name: Reject PR if: failure() uses: peter-evans/close-pull@v1