diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-13 13:06:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 13:06:49 +0200 |
| commit | cc718496cc5f92aeb3f1d630556609d1c5018ffb (patch) | |
| tree | 14100dc4b5e024353b78e2ff34b6076ee77deed3 | |
| parent | a18fbf3f9f8a69be1c2017f841d6879ae18c3e50 (diff) | |
| parent | 5e16fde8fe433e6e81a7a505bda8e96732c89993 (diff) | |
| download | vyos-build-cc718496cc5f92aeb3f1d630556609d1c5018ffb.tar.gz vyos-build-cc718496cc5f92aeb3f1d630556609d1c5018ffb.zip | |
Merge pull request #564 from vyos/mergify/bp/equuleus/pr-561
T6235: Git update actions-label-merge-conflict version (backport #561)
| -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 72ff3969..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-18.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" |