From 20ecb618e4f0167595c8a46ff1f4363e112f1df7 Mon Sep 17 00:00:00 2001 From: Matthias Endler Date: Thu, 5 Jan 2023 14:51:36 +0100 Subject: [PATCH] Fix automerge config (#904) With the latest changes in https://github.com/lycheeverse/lychee/pull/893 I think I broke automerge. Reverting some of the changes to fix that. --- .github/workflows/auto-merge.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index fd143c4..7abd063 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,6 +1,7 @@ name: 'Merge Dependencies' -on: [pull_request_target] +on: + pull_request: jobs: auto-merge: @@ -8,6 +9,9 @@ jobs: if: github.actor == 'dependabot[bot]' steps: - uses: actions/checkout@v2 - uses: ahmadnassri/action-dependabot-auto-merge@v2.6.6 + - uses: ahmadnassri/action-dependabot-auto-merge@v2.6.6 with: - github-token: ${{ secrets.AUTOMERGE_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.AUTOMERGE_TOKEN }} + # Merge all updates as long as they pass CI. + # Includes minor and patch updates. + update_type: "semver:major"