diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-15 14:38:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 14:38:22 +0200 |
| commit | 2b6820126d4891d5f7d2c53b66ba08468fe82f55 (patch) | |
| tree | 7155e9133fb4459204efa3af009fd468f6e6a21e /.github/workflows/pr-conflicts.yml | |
| parent | a7608991a8b381ad389e5492713e61a6ce3fd5d3 (diff) | |
| parent | dcb5d50abd66e207156f371fb80e6497d33390e8 (diff) | |
| download | vyos-1x-2b6820126d4891d5f7d2c53b66ba08468fe82f55.tar.gz vyos-1x-2b6820126d4891d5f7d2c53b66ba08468fe82f55.zip | |
Merge pull request #3649 from vyos/mergify/bp/equuleus/pr-36471.3.8
T6487: updated central workflows to use equuleus branch (backport #3647)
Diffstat (limited to '.github/workflows/pr-conflicts.yml')
| -rw-r--r-- | .github/workflows/pr-conflicts.yml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml deleted file mode 100644 index 2fd0bb42d..000000000 --- a/.github/workflows/pr-conflicts.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: "PR Conflicts checker" -on: - pull_request_target: - types: [synchronize] - -jobs: - Conflict_Check: - name: 'Check PR status: conflicts and resolution' - runs-on: ubuntu-latest - steps: - - name: check if PRs are dirty - uses: eps1lon/actions-label-merge-conflict@v3 - with: - dirtyLabel: "state: conflict" - removeOnDirtyLabel: "state: conflict resolved" - repoToken: "${{ secrets.GITHUB_TOKEN }}" - commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." - commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." |