diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-12 17:20:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 17:20:20 +0200 |
| commit | 1170a2fffe918957818c3b8ea53aad15a8898b87 (patch) | |
| tree | bc69a77d103b8bc1b7c1a1ca70fc4eb3136775c8 /.github | |
| parent | 6d8336f5ad2d9c4e0f12b54681db2924d6998d2d (diff) | |
| parent | 7451133671989e1207299e081cd26d3f526e25f6 (diff) | |
| download | vyos-1x-1170a2fffe918957818c3b8ea53aad15a8898b87.tar.gz vyos-1x-1170a2fffe918957818c3b8ea53aad15a8898b87.zip | |
Merge pull request #3300 from sever-sever/T6235
T6235: Git update actions-label-merge-conflict version
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/pr-conflicts.yml | 4 |
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" |