diff options
| author | Joas Schilling <coding@schilljs.com> | 2022-10-07 15:45:10 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2022-10-07 15:45:10 +0300 |
| commit | d940eaf3259b4986fddb826ffa35c44eaa9d8c9f (patch) | |
| tree | bb87ca86edeb5612eeb9d10573cebe9aa32959f9 | |
| parent | 1580222c122e4c7333a45f6a7b5ca5599e0eaf52 (diff) | |
Fix multi-approve actions
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | .github/autoapproval.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/dependabot-approve.yml | 11 |
3 files changed, 6 insertions, 17 deletions
diff --git a/.github/autoapproval.yml b/.github/autoapproval.yml deleted file mode 100644 index a3c83a3..0000000 --- a/.github/autoapproval.yml +++ /dev/null @@ -1,6 +0,0 @@ -from_owner: - - dependabot-preview[bot] -required_labels: - - dependencies -apply_labels: - - autoapproved diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index e0e6bfa..aa8355e 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -12,10 +12,16 @@ on: - master - stable* +permissions: + contents: read + jobs: auto-approve-merge: if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest + permissions: + # for hmarr/auto-approve-action to approve PRs + pull-requests: write steps: # Github actions bot approve diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml deleted file mode 100644 index cc5e6d1..0000000 --- a/.github/workflows/dependabot-approve.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Dependabot auto approve -on: pull_request - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: hmarr/auto-approve-action@v2.0.0 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" |