From 099d502d70d3eff679d5db475bdac04d426652f7 Mon Sep 17 00:00:00 2001 From: Krzysztof Knapik Date: Mon, 5 Aug 2024 11:45:54 +0200 Subject: [PATCH] [repo-manager] Update templates --- .github/workflows/auto-approve.yml | 2 +- .github/workflows/auto-merge.yml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index e1e4c8e..bdcf032 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: hmarr/auto-approve-action@v3 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'dependencies') + if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'self-approve') || contains(github.event.pull_request.labels.*.name, 'dependencies') with: github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index ff9644e..1e6ffc4 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,5 +1,8 @@ name: automerge on: + pull_request_target: + types: + - labeled pull_request_review: types: - submitted @@ -12,8 +15,17 @@ jobs: runs-on: ubuntu-latest steps: - name: automerge - uses: pascalgn/automerge-action@v0.16.2 + uses: pascalgn/automerge-action@v0.16.3 + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_METHOD: squash + MERGE_DELETE_BRANCH: true + MERGE_LABELS: "automerge,!automerge blocked" + - name: automerge-dependencies + uses: pascalgn/automerge-action@v0.16.3 env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_METHOD: squash MERGE_DELETE_BRANCH: true + MERGE_LABELS: "dependencies,!automerge blocked" + MERGE_REMOVE_LABELS: ""