Skip to content

GH Actions/label mngmnt: various tweaks #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2023
Merged

GH Actions/label mngmnt: various tweaks #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0126667
GH Actions/label mngmnt: auto-remove merge conflict label on PR merge
jrfnl Dec 4, 2023
6ea8869
GH Actions/label mngmnt: add additional triggers for merge conflict c…
jrfnl Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/label-merge-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
name: Check PRs for merge conflicts

on:
# Check for new conflicts due to merges.
push:
branches:
- master
# Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
pull_request_target:
types:
- opened
- edited
- synchronize
- reopened

# Cancels all previous workflow runs for the same branch that have not yet completed.
concurrency:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/label-remove-outdated.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
labels: |
Status: awaiting feedback
Status: close candidate
Status: has merge conflict
Status: needs investigation
Status: triage

Expand Down