diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-13 12:16:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 12:16:32 +0200 |
| commit | 3f594076208027cafdd13f343131ac2d2d3b2445 (patch) | |
| tree | 4a7ef1dbba03615dcfb70dfe70d8391d87000af0 | |
| parent | aa4667ab3dad6d30805b2d703700372f8a0184d2 (diff) | |
| parent | 0e76ededb2295f98490d5301dc2023cad615cb4b (diff) | |
| download | vyos-build-3f594076208027cafdd13f343131ac2d2d3b2445.tar.gz vyos-build-3f594076208027cafdd13f343131ac2d2d3b2445.zip | |
Merge pull request #562 from vyos/mergify/bp/sagitta/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 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" |