diff --git a/.github/workflows/automerger.yml b/.github/workflows/automerger.yml index 78607f4..ee097e9 100644 --- a/.github/workflows/automerger.yml +++ b/.github/workflows/automerger.yml @@ -1,9 +1,7 @@ name: 'Auto Merge PRs' on: - pull_request: - branches: - - master + workflow_call: permissions: pull-requests: write @@ -12,8 +10,6 @@ permissions: jobs: automerge: runs-on: ubuntu-latest - if: > - github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' steps: - uses: fastify/github-action-merge-dependabot@v3 with: diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 02e1916..c217100 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -32,3 +32,12 @@ jobs: needs: - extract-branch uses: maptiler/tileserver-gl/.github/workflows/ct.yml@master + automerger: + name: 'Automerge Dependabot PRs' + needs: + - ci + - ct + - extract-branch + if: > + github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' + uses: maptiler/tileserver-gl/.github/workflows/ct.yml@master