Skip to content

Commit

Permalink
T6235: Git update actions-label-merge-conflict version
Browse files Browse the repository at this point in the history
Update `actions-label-merge-conflict` due to `Node.js 16 actions are deprecated.`
  • Loading branch information
sever-sever committed Apr 13, 2024
1 parent b04c480 commit 252f299
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
jobs:
Conflict_Check:
name: 'Check PR status: conflicts and resolution'
runs-on: ubuntu-22.04
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: "state: conflict"
removeOnDirtyLabel: "state: conflict resolved"
Expand Down

0 comments on commit 252f299

Please sign in to comment.