Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Falk Puschner <falk.puschner@staffbase.com>
  • Loading branch information
0x46616c6b and flaxel committed Apr 25, 2024
1 parent 6da6b80 commit 551b37b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/template_merge_block.yml
Expand Up @@ -6,7 +6,7 @@ on:
label:
required: false
type: string
default: do not merge
default: "do not merge"
comment:
required: false
type: boolean
Expand All @@ -24,15 +24,15 @@ 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 == ''
uses: peter-evans/create-or-update-comment@v4.0.0
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.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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
```

</details>
Expand Down

0 comments on commit 551b37b

Please sign in to comment.