From e183e872cde585cc8a8a0fb6c6371250eafee49b Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:55:52 -0800 Subject: [PATCH 01/17] [bfops/deny-merge-labels]: add gh workflow to check merge-blocking labels --- .github/workflows/check-merge-labels.yml | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/check-merge-labels.yml diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml new file mode 100644 index 00000000000..a003ce5ac80 --- /dev/null +++ b/.github/workflows/check-merge-labels.yml @@ -0,0 +1,29 @@ +name: Check merge labels + +on: + pull_request: + types: [labeled, unlabeled] + merge_group: +permissions: read-all + +jobs: + check_merge_block_label: + if: ${{ contains(github.event.pull_request.labels.*.name, 'Do not merge') }} + runs-on: ubuntu-latest + steps: + - run: exit 1 + + check_future_release_label: + if: ${{ contains(github.event.pull_request.labels.*.name, 'release-0.9') }} + runs-on: ubuntu-latest + steps: + - run: exit 1 + + check_breaking_change_labels: + if: | ${{ + contains(github.event.pull_request.labels.*.name, 'abi-break') || + contains(github.event.pull_request.labels.*.name, 'breaking change') + }} + runs-on: ubuntu-latest + steps: + - run: exit 1 From 00eac8ace7b7db6f7ba6cd7a9bb0f2fbb335c809 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:59:49 -0800 Subject: [PATCH 02/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index a003ce5ac80..f4968e4f90a 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -20,7 +20,8 @@ jobs: - run: exit 1 check_breaking_change_labels: - if: | ${{ + if: | + ${{ contains(github.event.pull_request.labels.*.name, 'abi-break') || contains(github.event.pull_request.labels.*.name, 'breaking change') }} From de1c64a1c11f6d01e7b715bcc3adf13e4d40e60c Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:02:08 -0800 Subject: [PATCH 03/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index f4968e4f90a..18be5aae90d 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -21,10 +21,8 @@ jobs: check_breaking_change_labels: if: | - ${{ - contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') - }} + ${{ contains(github.event.pull_request.labels.*.name, 'abi-break') || + contains(github.event.pull_request.labels.*.name, 'breaking change') }} runs-on: ubuntu-latest steps: - run: exit 1 From 32f36ff5b1757d4d2473795ee113c1438f9852a6 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:04:28 -0800 Subject: [PATCH 04/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 18be5aae90d..a003ce5ac80 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -20,9 +20,10 @@ jobs: - run: exit 1 check_breaking_change_labels: - if: | - ${{ contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') }} + if: | ${{ + contains(github.event.pull_request.labels.*.name, 'abi-break') || + contains(github.event.pull_request.labels.*.name, 'breaking change') + }} runs-on: ubuntu-latest steps: - run: exit 1 From 294b3dcaff30890dce19b6602f50f9e35dba1988 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:05:30 -0800 Subject: [PATCH 05/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index a003ce5ac80..acd8d1edc19 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -20,10 +20,11 @@ jobs: - run: exit 1 check_breaking_change_labels: - if: | ${{ - contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') - }} + if: | + ${{ + contains(github.event.pull_request.labels.*.name, 'abi-break') || + contains(github.event.pull_request.labels.*.name, 'breaking change') + }} runs-on: ubuntu-latest steps: - run: exit 1 From 1d0daf4176f4391ed03b4e78d15e2415bc1c21a5 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:06:07 -0800 Subject: [PATCH 06/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index acd8d1edc19..83da004e278 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -21,10 +21,7 @@ jobs: check_breaking_change_labels: if: | - ${{ - contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') - }} + ${{ contains(github.event.pull_request.labels.*.name, 'abi-break') }} runs-on: ubuntu-latest steps: - run: exit 1 From a0023176a2fb4a14f2990907fb9584b7a5f7c805 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:06:57 -0800 Subject: [PATCH 07/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 83da004e278..395c44fb3e9 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -21,7 +21,7 @@ jobs: check_breaking_change_labels: if: | - ${{ contains(github.event.pull_request.labels.*.name, 'abi-break') }} + contains(github.event.pull_request.labels.*.name, 'abi-break') runs-on: ubuntu-latest steps: - run: exit 1 From 2a392d50bf52aa576f430692d9b030a67b1deee7 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:07:22 -0800 Subject: [PATCH 08/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 395c44fb3e9..856f643200f 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -21,7 +21,8 @@ jobs: check_breaking_change_labels: if: | - contains(github.event.pull_request.labels.*.name, 'abi-break') + contains(github.event.pull_request.labels.*.name, 'abi-break') || + contains(github.event.pull_request.labels.*.name, 'breaking change') runs-on: ubuntu-latest steps: - run: exit 1 From bfffcb071f119e62932aac70e23e149020d82333 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:08:48 -0800 Subject: [PATCH 09/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 856f643200f..4c312f24e25 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -7,7 +7,7 @@ on: permissions: read-all jobs: - check_merge_block_label: + Check merge labels: if: ${{ contains(github.event.pull_request.labels.*.name, 'Do not merge') }} runs-on: ubuntu-latest steps: From 1b4431abcea987a9c7dbd49f56c1e29bd4e531f6 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:09:59 -0800 Subject: [PATCH 10/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 4c312f24e25..3bbd256e4a6 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -7,22 +7,12 @@ on: permissions: read-all jobs: - Check merge labels: - if: ${{ contains(github.event.pull_request.labels.*.name, 'Do not merge') }} - runs-on: ubuntu-latest - steps: - - run: exit 1 - - check_future_release_label: - if: ${{ contains(github.event.pull_request.labels.*.name, 'release-0.9') }} - runs-on: ubuntu-latest - steps: - - run: exit 1 - - check_breaking_change_labels: + check: if: | contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') + contains(github.event.pull_request.labels.*.name, 'breaking change') || + contains(github.event.pull_request.labels.*.name, 'Do not merge') || + contains(github.event.pull_request.labels.*.name, 'release-0.9') runs-on: ubuntu-latest steps: - run: exit 1 From 0eaa6837e498dbe4ded05882db45b7c045f3ab2d Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:17:45 -0800 Subject: [PATCH 11/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 3bbd256e4a6..fb9b371e795 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -8,11 +8,15 @@ permissions: read-all jobs: check: - if: | - contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') || - contains(github.event.pull_request.labels.*.name, 'Do not merge') || - contains(github.event.pull_request.labels.*.name, 'release-0.9') runs-on: ubuntu-latest steps: - - run: exit 1 + - if: | + contains(github.event.pull_request.labels.*.name, 'do not merge') + run: echo "::error::This is labeled \"Do not merge\"." && exit 1 + - if: | + contains(github.event.pull_request.labels.*.name, 'release-0.9') + run: echo "::error::This is targeted for a future release." && exit 1 + - if: | + contains(github.event.pull_request.labels.*.name, 'abi-break') || + contains(github.event.pull_request.labels.*.name, 'breaking change') + run: echo "::error::This is a breaking change." && exit 1 From 3fa04454d5a2330f7cd0f3c46081e377bc495884 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:19:04 -0800 Subject: [PATCH 12/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index fb9b371e795..60b64efda88 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -7,16 +7,19 @@ on: permissions: read-all jobs: - check: + checks: runs-on: ubuntu-latest steps: - - if: | + - id: explicitly_disallowed + if: | contains(github.event.pull_request.labels.*.name, 'do not merge') run: echo "::error::This is labeled \"Do not merge\"." && exit 1 - - if: | + - id: future_release + if: | contains(github.event.pull_request.labels.*.name, 'release-0.9') run: echo "::error::This is targeted for a future release." && exit 1 - - if: | + - id: breaking_change + if: | contains(github.event.pull_request.labels.*.name, 'abi-break') || contains(github.event.pull_request.labels.*.name, 'breaking change') run: echo "::error::This is a breaking change." && exit 1 From 343af2ca6913d9eeb2aa944878721b09ed3cbd9c Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:21:21 -0800 Subject: [PATCH 13/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 60b64efda88..ff60205e7b7 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -22,4 +22,6 @@ jobs: if: | contains(github.event.pull_request.labels.*.name, 'abi-break') || contains(github.event.pull_request.labels.*.name, 'breaking change') - run: echo "::error::This is a breaking change." && exit 1 + run: | + echo "::error ::This is a breaking change." >/dev/stderr + exit 1 From 3f7b9e2f1194e9ddc7a682786758e75ed4578d35 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:21:45 -0800 Subject: [PATCH 14/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index ff60205e7b7..237f6dbc3d5 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -17,7 +17,9 @@ jobs: - id: future_release if: | contains(github.event.pull_request.labels.*.name, 'release-0.9') - run: echo "::error::This is targeted for a future release." && exit 1 + run: | + echo "::error ::This is targeted for a future release." >/dev/stderr + exit 1 - id: breaking_change if: | contains(github.event.pull_request.labels.*.name, 'abi-break') || From 332962838d475b5272c8b5ad33663e3adeb11682 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:24:44 -0800 Subject: [PATCH 15/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 237f6dbc3d5..25b777ec75d 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -13,17 +13,21 @@ jobs: - id: explicitly_disallowed if: | contains(github.event.pull_request.labels.*.name, 'do not merge') - run: echo "::error::This is labeled \"Do not merge\"." && exit 1 + run: | + echo "This is labeled \"Do not merge\"." + exit 1 + - id: future_release if: | contains(github.event.pull_request.labels.*.name, 'release-0.9') run: | - echo "::error ::This is targeted for a future release." >/dev/stderr + echo "This is targeted for a future release." exit 1 + - id: breaking_change if: | contains(github.event.pull_request.labels.*.name, 'abi-break') || contains(github.event.pull_request.labels.*.name, 'breaking change') run: | - echo "::error ::This is a breaking change." >/dev/stderr + echo "This is a breaking change." exit 1 From e88a00b38d3a7d311131045b110a4df7e2c5f191 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:27:41 -0800 Subject: [PATCH 16/17] [bfops/deny-merge-labels]: fix? --- .github/workflows/check-merge-labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index 25b777ec75d..e0a322ca78a 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -7,7 +7,7 @@ on: permissions: read-all jobs: - checks: + label_checks: runs-on: ubuntu-latest steps: - id: explicitly_disallowed From af0fe49b6f40341726e34e5602ec5a89373af425 Mon Sep 17 00:00:00 2001 From: Zeke Foppa <196249+bfops@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:50:27 -0800 Subject: [PATCH 17/17] [bfops/deny-merge-labels]: simplify --- .github/workflows/check-merge-labels.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/check-merge-labels.yml b/.github/workflows/check-merge-labels.yml index e0a322ca78a..4b54295c32e 100644 --- a/.github/workflows/check-merge-labels.yml +++ b/.github/workflows/check-merge-labels.yml @@ -10,24 +10,9 @@ jobs: label_checks: runs-on: ubuntu-latest steps: - - id: explicitly_disallowed + - id: manually_blocked if: | contains(github.event.pull_request.labels.*.name, 'do not merge') run: | echo "This is labeled \"Do not merge\"." exit 1 - - - id: future_release - if: | - contains(github.event.pull_request.labels.*.name, 'release-0.9') - run: | - echo "This is targeted for a future release." - exit 1 - - - id: breaking_change - if: | - contains(github.event.pull_request.labels.*.name, 'abi-break') || - contains(github.event.pull_request.labels.*.name, 'breaking change') - run: | - echo "This is a breaking change." - exit 1