summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-04-12 13:37:41 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2024-04-12 13:47:28 +0000
commit7451133671989e1207299e081cd26d3f526e25f6 (patch)
treebc69a77d103b8bc1b7c1a1ca70fc4eb3136775c8 /.github
parent6d8336f5ad2d9c4e0f12b54681db2924d6998d2d (diff)
downloadvyos-1x-7451133671989e1207299e081cd26d3f526e25f6.tar.gz
vyos-1x-7451133671989e1207299e081cd26d3f526e25f6.zip
T6235: Git update actions-label-merge-conflict version
Update `actions-label-merge-conflict` due to `Node.js 16 actions are deprecated.`
Diffstat (limited to '.github')
-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"