From 2f2a16fca679f6c74082a9ae54c4dc622faf2f02 Mon Sep 17 00:00:00 2001 From: Alex Laird Date: Thu, 7 Dec 2023 11:56:21 -0600 Subject: [PATCH] Auto-merge bot streamlining. --- .github/dependabot.yml | 3 ++- .github/workflows/auto-merge.yml | 15 --------------- .github/workflows/build.yml | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 778be3d..73ffd11 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,6 +3,7 @@ updates: - package-ecosystem: "pip" directory: "/" schedule: - interval: "daily" + interval: "weekly" + day: "monday" time: "05:00" timezone: "America/Chicago" diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index c4db3c5..0000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: "Auto Merge Dependabot" - -on: - pull_request_target: - -jobs: - auto-merge: - runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' - steps: - - uses: actions/checkout@v2 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - github-token: ${{ secrets.AUTOMERGE_PUSH_TOKEN }} - target: minor diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02cee97..936756e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,3 +36,18 @@ jobs: - name: Run tests run: make test + + automerge: + name: "Auto Approve" + needs: ci + runs-on: ubuntu-latest + + permissions: + pull-requests: write + contents: write + + steps: + - uses: fastify/github-action-merge-dependabot@v3 + with: + target: minor + use-github-auto-merge: true