From 7f8fc1b8c22b068204f9be332d97f6c97c25a90e Mon Sep 17 00:00:00 2001 From: Henrik Fricke Date: Tue, 1 Jun 2021 11:12:08 +0200 Subject: [PATCH] fix: dependabot auto merge see: https://github.com/ahmadnassri/action-dependabot-auto-merge/issues/60\#issuecomment-820491656 --- .github/auto-merge.yml | 3 --- .github/workflows/dependabot-auto-merge.yml | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 .github/auto-merge.yml diff --git a/.github/auto-merge.yml b/.github/auto-merge.yml deleted file mode 100644 index 19dc24fa..00000000 --- a/.github/auto-merge.yml +++ /dev/null @@ -1,3 +0,0 @@ -- match: - dependency_type: all - update_type: "semver:minor" \ No newline at end of file diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 592b78dd..e8a54c5c 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,14 +1,14 @@ -name: dependabot-auto-merge - +name: Dependabot Auto Merge on: - pull_request: - + schedule: + - cron: "0 * * * *" jobs: - auto-merge: - runs-on: ubuntu-latest + test: + name: Auto-merge minor and patch updates + runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 + - uses: koj-co/dependabot-pr-action@master with: - target: minor - github-token: ${{ secrets.DEPENDABOT_AUTO_MERGE_GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.DEPENDABOT_AUTO_MERGE_GITHUB_TOKEN }} + merge-minor: true + merge-patch: true