summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 04:24:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 04:24:32 +0000
commit35cadacd2bb9383686753731e31bd7e145fb2506 (patch)
tree4489adbde75a837989533837185b2b8369a0bf68 /.github
parentAdding debian version 9.1-0.1. (diff)
downloadfrr-35cadacd2bb9383686753731e31bd7e145fb2506.tar.xz
frr-35cadacd2bb9383686753731e31bd7e145fb2506.zip
Merging upstream version 10.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/freeze.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/freeze.yml b/.github/workflows/freeze.yml
index f3506d0..a780298 100644
--- a/.github/workflows/freeze.yml
+++ b/.github/workflows/freeze.yml
@@ -1,4 +1,4 @@
-name: Warn before merging if a "freeze" label exists
+name: Warn before merging if a "freeze" or "do not merge" label exists
on:
pull_request_target:
@@ -6,12 +6,12 @@ on:
jobs:
freeze_warning:
- if: ${{ contains(github.event.*.labels.*.name, 'freeze') }}
- name: Warn before merging if a "freeze" label exists
+ if: ${{ contains(github.event.*.labels.*.name, 'freeze') || contains(github.event.*.labels.*.name, 'do not merge') }}
+ name: Warn before merging if a "freeze" or "do not merge" label exists
runs-on: ubuntu-latest
steps:
- name: Check for "freeze" label
run: |
- echo "Pull request is labeled as 'freeze'"
+ echo "Pull request is labeled as 'freeze' or 'do not merge'"
echo "This workflow fails so that the pull request cannot be merged."
exit 1