From 551b37b4e76a656deaeb272969bafa74fc1fd9f6 Mon Sep 17 00:00:00 2001 From: 0x46616c6b <0x46616c6b@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:32:30 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Falk Puschner --- .github/workflows/template_merge_block.yml | 6 +++--- README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/template_merge_block.yml b/.github/workflows/template_merge_block.yml index 26f3b6a..fc18476 100644 --- a/.github/workflows/template_merge_block.yml +++ b/.github/workflows/template_merge_block.yml @@ -6,7 +6,7 @@ on: label: required: false type: string - default: do not merge + default: "do not merge" comment: required: false type: boolean @@ -24,7 +24,7 @@ jobs: id: comment with: issue-number: ${{ github.event.pull_request.number }} - body-includes: ⚠️ **The merge is blocked.** + body-includes: ⚠️ **This Pull Request is not ready to be merged.** - name: Comment on PR if: inputs.comment && contains(github.event.pull_request.labels.*.name, inputs.label) && steps.comment.outputs.comment-id == '' @@ -32,7 +32,7 @@ jobs: with: issue-number: ${{ github.event.pull_request.number }} body: | - ⚠️ **The merge is blocked.** + ⚠️ **This Pull Request is not ready to be merged.** Remove the label '${{ inputs.label }}' to proceed. diff --git a/README.md b/README.md index 096a6e8..ec2cea1 100644 --- a/README.md +++ b/README.md @@ -245,12 +245,12 @@ on: jobs: block: - uses: Staffbase/gha-workflows/.github/workflows/template_merge_block.yml@v2.0.0 + uses: Staffbase/gha-workflows/.github/workflows/template_merge_block.yml@v5.2.0 with: # optional: name of the label if the PR should not be merged, default: do not merge label: merge block # optional: comment when the PR is blocked, default: true - comment: true + comment: false ```