From 204ba9a0c420528dea4008cd93ff39a76cfb2161 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 4 Mar 2022 08:41:38 +0100 Subject: [PATCH] Adjust merge labels (#1210) --- .github/workflows/auto-approve.yml | 2 +- .github/workflows/auto-merge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index dee94fc35..c6319d36c 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -5,7 +5,7 @@ on: 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: diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index c07e4870d..0d4e80659 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -5,7 +5,7 @@ on: types: [labeled] jobs: - auto-merge: + merge: runs-on: ubuntu-latest steps: - uses: jacogr/action-merge@master