From 00538595c10e78e92981b0793f9287fa259cb436 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 4 Mar 2022 08:40:58 +0100 Subject: [PATCH] Adjust auto actions (#621) * Adjust auto actions * Adjust --- .github/workflows/{approve.yml => auto-approve.yml} | 6 +++--- .github/workflows/{merge.yml => auto-merge.yml} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{approve.yml => auto-approve.yml} (87%) rename .github/workflows/{merge.yml => auto-merge.yml} (82%) diff --git a/.github/workflows/approve.yml b/.github/workflows/auto-approve.yml similarity index 87% rename from .github/workflows/approve.yml rename to .github/workflows/auto-approve.yml index 58591316..c6319d36 100644 --- a/.github/workflows/approve.yml +++ b/.github/workflows/auto-approve.yml @@ -1,16 +1,16 @@ -name: PR +name: bot on: pull_request: types: [labeled] jobs: - auto-approve: + approve: if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && (!github.event.pull_request || github.event.pull_request.head.repo.full_name == github.repository)" runs-on: ubuntu-latest steps: - uses: jacogr/action-approve@master with: authors: jacogr - labels: automerge + labels: -auto token: ${{ secrets.GH_PAT_BOT }} diff --git a/.github/workflows/merge.yml b/.github/workflows/auto-merge.yml similarity index 82% rename from .github/workflows/merge.yml rename to .github/workflows/auto-merge.yml index a90e9671..0d4e8065 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,16 +1,16 @@ -name: PR +name: bot on: pull_request: types: [labeled] jobs: - auto-merge: + merge: runs-on: ubuntu-latest steps: - uses: jacogr/action-merge@master with: checks: build,lint,test - labels: automerge + labels: -auto strategy: squash token: ${{ secrets.GH_PAT_BOT }}