summaryrefslogtreecommitdiff
path: root/.github/workflows/pr-conflicts.yml
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-06-05 22:03:13 +0200
committerGitHub <noreply@github.com>2023-06-05 22:03:13 +0200
commit3cfeddebb73e12de15d46d13c44003ede2d72c19 (patch)
treec333b68aa68c795b42826957291def56b25def36 /.github/workflows/pr-conflicts.yml
parent51866e170f93f6b00e4cabcd379f2cdb3728e118 (diff)
parent1faf7874ed5a0347446e1755938c2c570ba78f31 (diff)
downloadvyos-1x-3cfeddebb73e12de15d46d13c44003ede2d72c19.tar.gz
vyos-1x-3cfeddebb73e12de15d46d13c44003ede2d72c19.zip
Merge pull request #2025 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 72ff3969b..96040cd60 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