Updated runners to ubuntu 2024.04 LTS

Consolidated some node cache utilization in its own action

Updated merge conflict detector action version

PRs with merge conflicts now get the Review Required tag removed, and
PRs that had a conflict get a comment remembering the author to mark
them as ready to review if they are ready once the conflict is resolved
This commit is contained in:
Fluffy
2025-02-15 23:25:52 +00:00
committed by GitHub
parent 3c7a028366
commit b512bcdbf0
5 changed files with 21 additions and 36 deletions
+3 -1
View File
@@ -14,8 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "Merge Conflict"
removeOnDirtyLabel: "Review Required"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. Mark the PR as ready for review again if it is ready to be reviewed."