Skip to content

Update conflicting PR label workflow #750

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
Vincent Biret (baywet) merged 7 commits into from
Sep 23, 2026
Merged

Update conflicting PR label workflow #750

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83b37fd
Update conflicting PR label workflow
baywet Sep 23, 2026
f8c5904
Check conflicts when pull requests open
baywet Sep 23, 2026
9635730
Check conflicts when pull requests reopen
baywet Sep 23, 2026
fb54c9b
Normalize conflicting PR workflow indentation
baywet Sep 23, 2026
fa64e66
chore: removes unnecessary condition
baywet Sep 23, 2026
20d920f
chore: linting
baywet Sep 23, 2026
38760be
ci: Rename job to label merge conflicts in workflow
baywet Sep 23, 2026
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
29 changes: 13 additions & 16 deletions .github/workflows/conflicting-pr-label.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ name: PullRequestConflicting
on:
push:
branches: [ main ]
pull_request:
types: [synchronize]
pull_request_target:
types: [opened, reopened, synchronize]
branches: [ main ]

permissions:
Expand All @@ -17,22 +17,19 @@ permissions:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# This workflow contains a single job for labeling pull requests with merge conflicts
label-merge-conflicts:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null
id: check
with:
dirtyLabel: "conflicting"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
continueOnMissingPermissions: true
commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.'
commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.'
env:
LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }}
- name: check merge conflicts
uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
id: check
with:
dirtyLabel: "conflicting"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
continueOnMissingPermissions: true
commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.'
commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.'
Loading