From 11de4f95a2f715081b0eaad2ed0f8fae45c11fd4 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 11 Jul 2024 15:02:23 -0600 Subject: [PATCH 1/2] Add check for after-next-version label to design approved status --- .github/workflows/merge-checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-checks.yml b/.github/workflows/merge-checks.yml index 6561c429e2..28b29d5cec 100644 --- a/.github/workflows/merge-checks.yml +++ b/.github/workflows/merge-checks.yml @@ -1,7 +1,7 @@ name: Merge Checks on: - pull_request_target: + pull_request: branches: [ master ] types: [synchronize, opened, reopened, labeled, unlabeled] @@ -17,7 +17,7 @@ jobs: run: | set -x pipefail status_state="pending" - if ${{ contains(github.event.*.labels.*.name, 'design-approved') }}; then + if ${{ contains(github.event.pull_request.labels.*.name, 'design-approved') && !contains(github.event.pull_request.labels.*.name, 'after-next-version') }}; then status_state="success" else resp="$(curl -sSL --fail-with-body \ From 13433ce94961182ac586d86190cb56c90b6132e2 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 11 Jul 2024 15:04:08 -0600 Subject: [PATCH 2/2] Undo change for testing --- .github/workflows/merge-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-checks.yml b/.github/workflows/merge-checks.yml index 28b29d5cec..c9f7957389 100644 --- a/.github/workflows/merge-checks.yml +++ b/.github/workflows/merge-checks.yml @@ -1,7 +1,7 @@ name: Merge Checks on: - pull_request: + pull_request_target: branches: [ master ] types: [synchronize, opened, reopened, labeled, unlabeled]