From 3cd614c3286c3c75d9be319831e941f1a8ed7174 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 29 Apr 2024 12:04:17 +0200 Subject: [PATCH] fix(ci): only block merge on freeze for stable branches Signed-off-by: Max --- .github/workflows/block-merge-freeze.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/block-merge-freeze.yml b/.github/workflows/block-merge-freeze.yml index 2e4b3e25dc9..6fcc25c534d 100644 --- a/.github/workflows/block-merge-freeze.yml +++ b/.github/workflows/block-merge-freeze.yml @@ -19,11 +19,14 @@ concurrency: jobs: block-merges-during-freeze: name: Block merges during freezes - - if: github.event.pull_request.draft == false - + if: | + github.event.pull_request.draft == false + && ( + startsWith(github.base_ref, 'stable') + || github.base_ref == 'main' + || github.base_ref == 'master' + ) runs-on: ubuntu-latest-low - steps: - name: Register server reference to fallback to master branch run: |