From 879c8e79071d08bbe06efbaad3d078ced56a5b6b Mon Sep 17 00:00:00 2001 From: Henri Koski Date: Tue, 3 Dec 2024 13:57:08 +0200 Subject: [PATCH] Enable automerge --- .github/workflows/pr.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e2513b7..6d01a72 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -50,10 +50,13 @@ jobs: pull-requests: write contents: write runs-on: elisa-normal - timeout-minutes: 15 + if: | + github.event.pull_request.user.login == 'dependabot[bot]' || + github.event.pull_request.user.login == 'dops-sre' steps: - - name: Automerge dependabot PR - uses: elisa-actions/github-action-merge-dependabot@v3 - with: - target: minor - github-token: ${{ secrets.DOPS_SRE_PAT }} + - name: Automerge dependabot and repo-updater PR's + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{ secrets.DOPS_SRE_PAT }} +