fix: replace broken label-conflicts action with eps1lon/actions-label-merge-conflict#21704
Draft
bhimrazy wants to merge 1 commit intoLightning-AI:masterfrom
Draft
fix: replace broken label-conflicts action with eps1lon/actions-label-merge-conflict#21704bhimrazy wants to merge 1 commit intoLightning-AI:masterfrom
bhimrazy wants to merge 1 commit intoLightning-AI:masterfrom
Conversation
…orkflow 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.
bhimrazy
requested review from
ethanwharris,
justusschock and
tchaton
as code owners
deependujha
reviewed
May 8, 2026
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021 | ||
| - uses: eps1lon/actions-label-merge-conflict@636b369ea34ff799b8db5182df6f19e39b2d4adb # v3.0.3 |
Collaborator
There was a problem hiding this comment.
where did you get this commit hash from? I see commit hash to be: 1df065ebe6e3310545d4f4c4e862e43bdca146f0.
can you help me on this: https://github.com/eps1lon/actions-label-merge-conflict
Collaborator
Author
There was a problem hiding this comment.
mybad, I will change that to the 3.0.3
In the meantime, I was checking if the upstream repo accepts the fixes: mschilde/auto-label-merge-conflicts#67
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes the
triage-conflictsCI check that has been failing due to a broken upstream Docker build inmschilde/auto-label-merge-conflicts.Root Cause
The
mschilde/auto-label-merge-conflictsaction uses a Docker-based runner withnode:alpine, which no longer shipsyarnby default. This causes the Docker build to fail with:The upstream repo is effectively unmaintained (last real activity 2021, latest tag
v2.0has the same broken Dockerfile).Fix
eps1lon/actions-label-merge-conflict@v3.0.3— a JS-based action (no Docker build), actively maintained, pinned to full commit SHApull_requesttrigger alongsidepull_request_targetso the check runs correctly from the head branch as well📚 Documentation preview 📚: https://pytorch-lightning--21704.org.readthedocs.build/en/21704/