Skip to content

Commit

Permalink
DNM: TEST: feat: improve merge-check action to leave a comment and la…
Browse files Browse the repository at this point in the history
…bel to PRs
  • Loading branch information
PastaPastaPasta authored and UdjinM6 committed Aug 10, 2024
1 parent efe4c2d commit 0af84d1
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
name: Check Merge Fast-Forward Only

permissions:
pull-requests: write

on:
push:
pull_request:
- push
- pull_request_target
- pull_request_review

jobs:
check_merge:
Expand All @@ -27,3 +31,17 @@ jobs:
else
git merge --ff-only ${{ github.sha }}
fi
- name: add labels
uses: actions-ecosystem/action-add-labels@v1
if: failure()
with:
labels: |
needs rebase
- name: comment
uses: mshick/add-pr-comment@v2
if: failure()
with:
message: |
This pull request has conflicts, please rebase.

0 comments on commit 0af84d1

Please sign in to comment.