summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-04-12 13:37:41 +0000
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-04-12 15:21:16 +0000
commit71ae4ba60f7a5b69b41c2f4e3c2ec557aac3c719 (patch)
tree42c24ffb9e02a8eb83bec073b9d794bd6b8939f7
parent28983d57e6d18c8d6564c8d72f253618451e5a41 (diff)
downloadvyos-1x-71ae4ba60f7a5b69b41c2f4e3c2ec557aac3c719.tar.gz
vyos-1x-71ae4ba60f7a5b69b41c2f4e3c2ec557aac3c719.zip
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 7451133671989e1207299e081cd26d3f526e25f6)
-rw-r--r--.github/workflows/pr-conflicts.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml
index 96040cd60..2fd0bb42d 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"