diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-12 17:31:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 17:31:01 +0200 |
| commit | 0a883649f7a181883a8d97d6ee82ce27856d6e13 (patch) | |
| tree | 42c24ffb9e02a8eb83bec073b9d794bd6b8939f7 | |
| parent | 28983d57e6d18c8d6564c8d72f253618451e5a41 (diff) | |
| parent | 71ae4ba60f7a5b69b41c2f4e3c2ec557aac3c719 (diff) | |
| download | vyos-1x-0a883649f7a181883a8d97d6ee82ce27856d6e13.tar.gz vyos-1x-0a883649f7a181883a8d97d6ee82ce27856d6e13.zip | |
Merge pull request #3301 from vyos/mergify/bp/sagitta/pr-3300
T6235: Git update actions-label-merge-conflict version (backport #3300)
| -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" |