summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-04-13 08:33:39 +0000
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-04-13 10:15:38 +0000
commit0e76ededb2295f98490d5301dc2023cad615cb4b (patch)
tree4a7ef1dbba03615dcfb70dfe70d8391d87000af0 /.github
parentaa4667ab3dad6d30805b2d703700372f8a0184d2 (diff)
downloadvyos-build-0e76ededb2295f98490d5301dc2023cad615cb4b.tar.gz
vyos-build-0e76ededb2295f98490d5301dc2023cad615cb4b.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 252f29949e6cc538d0a63f58a46c34e9447dfe8a)
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 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"