diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-05-02 12:57:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 12:57:28 +0200 |
| commit | 087a04327ca37fd6781e21f645b53962b6bf2cc8 (patch) | |
| tree | 04589adf596d0822ea8a86f136ab088ebe2180e3 /.github/workflows/pr-conflicts.yml | |
| parent | bc5e7ba65b85a8e25273aad67de3da52af9ea5d2 (diff) | |
| parent | 9a99f1ddf1298772015470beffe41c19d613dd01 (diff) | |
| download | vyos-1x-087a04327ca37fd6781e21f645b53962b6bf2cc8.tar.gz vyos-1x-087a04327ca37fd6781e21f645b53962b6bf2cc8.zip | |
Merge pull request #3398 from vyos/mergify/bp/equuleus/pr-3300
T6235: Git update actions-label-merge-conflict version (backport #3300)
Diffstat (limited to '.github/workflows/pr-conflicts.yml')
| -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" |