From 0e76ededb2295f98490d5301dc2023cad615cb4b Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Sat, 13 Apr 2024 08:33:39 +0000 Subject: T6235: Git update actions-label-merge-conflict version Update `actions-label-merge-conflict` due to `Node.js 16 actions are deprecated.` (cherry picked from commit 252f29949e6cc538d0a63f58a46c34e9447dfe8a) --- .github/workflows/pr-conflicts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml index 96040cd6..2fd0bb42 100644 --- a/.github/workflows/pr-conflicts.yml +++ b/.github/workflows/pr-conflicts.yml @@ -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" -- cgit v1.2.3