Skip to content

Commit 88352b7

Browse files
authored
ci: bump auto-label-merge-conflicts commit hash (#21704)
* fix: replace broken mschilde action with eps1lon in label-conflicts workflow mschilde/auto-label-merge-conflicts uses a Docker-based action where node:alpine no longer ships yarn, causing the build to fail. Replaced with eps1lon/actions-label-merge-conflict@v3.0.3 (JS-based, no Docker). Also added pull_request trigger alongside pull_request_target. * update the hash * trigegr:ci * add pull_request event types to label conflicts workflow * remove pr event
1 parent 78bf021 commit 88352b7

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/label-conflicts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
triage-conflicts:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021
17+
- uses: mschilde/auto-label-merge-conflicts@cd484bbf0476fbe79474a937681a253e094cac3d # May 9, 2026
1818
with:
1919
CONFLICT_LABEL_NAME: "has conflicts"
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)