summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
authorRobert Göhler <github@ghlr.de>2023-06-06 21:14:17 +0200
committerGitHub <noreply@github.com>2023-06-06 21:14:17 +0200
commitd93a764014ac4ec30d64402cbdb70486c074d6fa (patch)
tree2d0966d9104d5f8aca341a632edf39ca06ae3e0e /.github/workflows/pr-conflicts.yml
parentd0a152b51b8c35af294e5dcd96d8ee9c6f6efd34 (diff)
parent3afb011088dfff53fddde5234df6ead4efe70c91 (diff)
downloadvyos-documentation-d93a764014ac4ec30d64402cbdb70486c074d6fa.tar.gz
vyos-documentation-d93a764014ac4ec30d64402cbdb70486c074d6fa.zip
Merge pull request #1025 from sever-sever/T5258
T5258: git Actions use ubuntu-22.04 for PR conflicts checker
Diffstat (limited to '.github/workflows/pr-conflicts.yml')
-rw-r--r--.github/workflows/pr-conflicts.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml
index 87bc8c9f..8f2db469 100644
--- a/.github/workflows/pr-conflicts.yml
+++ b/.github/workflows/pr-conflicts.yml
@@ -6,7 +6,7 @@ on:
jobs:
Conflict_Check:
name: 'Check PR status: conflicts and resolution'
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-22.04
steps:
- name: check if PRs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x