diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-13 12:14:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 12:14:00 +0200 |
| commit | 491b42f58f2a466c02b053bffc41eead81255d23 (patch) | |
| tree | 065d95128826643cf5fb89d90aed74c790da1b9f | |
| parent | b04c480b6059960004f08812b10b38b39862e316 (diff) | |
| parent | 252f29949e6cc538d0a63f58a46c34e9447dfe8a (diff) | |
| download | vyos-build-491b42f58f2a466c02b053bffc41eead81255d23.tar.gz vyos-build-491b42f58f2a466c02b053bffc41eead81255d23.zip | |
Merge pull request #561 from sever-sever/T6235-build
T6235: Git update actions-label-merge-conflict version
| -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 96040cd6..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-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" |