From 3610e63d5319dd7a201213a8c1c7e032125d6cf6 Mon Sep 17 00:00:00 2001 From: MayaGillilan <101652314+MayaGillilan@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:29:58 +0100 Subject: [PATCH] chore: fix dependabot automerge (#1547) --- .github/workflows/auto-merge.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 75607b9f5..0061851b0 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -3,9 +3,11 @@ name: 'dependabot approve-and-request-merge' on: pull_request_target jobs: - build: + worker: permissions: - pull-requests: read + pull-requests: write + contents: write + id-token: write runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' steps: @@ -14,13 +16,8 @@ jobs: uses: dependabot/fetch-metadata@v1 with: github-token: '${{ secrets.GITHUB_TOKEN }}' - worker: - permissions: - contents: write - id-token: write - runs-on: ubuntu-latest - if: ${{github.actor == 'dependabot[bot]' && steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' && !contains(steps.dependabot-metadata.outputs.dependency-names, 'slate') && !contains(steps.dependabot-metadata.outputs.dependency-names, 'plate')}} - steps: - - uses: contentful/github-auto-merge@v1 + - name: Auto-merge + if: ${{steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' && !contains(steps.dependabot-metadata.outputs.dependency-names, 'slate') && !contains(steps.dependabot-metadata.outputs.dependency-names, 'plate')}} + uses: contentful/github-auto-merge@v1 with: VAULT_URL: ${{ secrets.VAULT_URL }}