-
-
Notifications
You must be signed in to change notification settings - Fork 229
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: run merge conflict detection on pull requests too
Signed-off-by: Fernando Fernández <ferferga@hotmail.com>
- Loading branch information
Showing
4 changed files
with
34 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
name: Automation 🎛️ | ||
|
||
on: | ||
workflow_call: | ||
|
||
jobs: | ||
label: | ||
name: Label conflicted PRs 🏷️⛔ | ||
if: ${{ always() && !cancelled() }} | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Check all PRs for merge conflicts and label them ⛔ | ||
uses: eps1lon/actions-label-merge-conflict@v3.0.2 | ||
with: | ||
dirtyLabel: "merge conflict" | ||
repoToken: ${{ secrets.JF_BOT_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters