From 86a4e4e20180ded9bd5c4c42320f38a0ce43716e Mon Sep 17 00:00:00 2001 From: xLinka Date: Wed, 17 Apr 2024 12:10:59 +0100 Subject: [PATCH] Update conflicts.yml why broken --- .github/workflows/conflicts.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index 6e32a0f..63e08c4 100644 --- a/.github/workflows/conflicts.yml +++ b/.github/workflows/conflicts.yml @@ -1,23 +1,16 @@ -name: Check for merge conflicts +name: 'Check for merge conflicts' on: + push: + branches: + - main pull_request: branches: - main - jobs: - add_labels: + triage: runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - repository-projects: write steps: - - name: Checkout code - uses: actions/checkout@v2 - - - - name: Check for merge conflicts - uses: mschilde/auto-label-merge-conflicts@v2.0 + - uses: mschilde/auto-label-merge-conflicts@v2.0 with: CONFLICT_LABEL_NAME: "Has Conflicts" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file