From c8eb2ee390362bbb950b513fc9ce82b4e7da0c35 Mon Sep 17 00:00:00 2001 From: Andrey Kaipov Date: Tue, 19 Dec 2023 11:21:49 -0500 Subject: [PATCH 1/2] remove markdown from chore --- .github/release-drafter.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 419d15e4..a4033e1e 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -6,14 +6,15 @@ tag-prefix: v autolabeler: - label: chore files: - - '*.md' - 'docker/*' - '*.sh' - Makefile branch: - /chore\/.+/ - /ci\/.+/ - - /docs?\/.+/ + - /docs\/.+/ + title: + - /docs/i - label: bug branch: - /fix\/.+/ From 9d12cae4b805f6e927df573d920e4f3648c9ac17 Mon Sep 17 00:00:00 2001 From: Andrey Kaipov Date: Tue, 19 Dec 2023 11:22:16 -0500 Subject: [PATCH 2/2] add auto merge workflow for bots --- .github/workflows/auto-merge.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 00000000..232ad2a5 --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,28 @@ +name: Auto-merge bot PRs + +on: + workflow_dispatch: + pull_request: + +permissions: + pull-requests: write + contents: write + +jobs: + automerge: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' || github.actor == 'cathy-cloud[bot]' + steps: + - uses: actions/checkout@v4 + + - uses: tibdex/github-app-token@v2 + id: generate-token + with: + app_id: ${{ secrets.CATHY_CLOUD_APP_ID }} + private_key: ${{ secrets.CATHY_CLOUD_APP_PRIVATE_KEY }} + + - name: automerge bot PRs + run: | + gh pr merge --squash --auto ${{ github.event.pull_request.number }} + env: + GH_TOKEN: ${{ steps.generate-token.outputs.token }}