From 38a0e5413c4c57ada0c44fb5bc63a1bd2a13b22a Mon Sep 17 00:00:00 2001 From: dahn Date: Mon, 18 May 2026 13:41:00 +0200 Subject: [PATCH 1/4] Refactor merge conflict checker workflow Updated workflow triggers and permissions for merge conflict checker. --- .github/workflows/merge-conflict-checker.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml index 748156a2d9ce..2c826a47c7ec 100644 --- a/.github/workflows/merge-conflict-checker.yml +++ b/.github/workflows/merge-conflict-checker.yml @@ -17,16 +17,14 @@ name: "PR Merge Conflict Check" on: - push: - pull_request: - types: [opened, synchronize, reopened] + schedule: + - cron: '*/10 * * * *' + workflow_dispatch: -permissions: # added using https://github.com/step-security/secure-workflows - contents: read +permissions: {} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + group: "gh-aw-${{ github.workflow }}" jobs: triage: From d96f8ccf72c03cd611b4e4c3f197343f501de0bd Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 19 May 2026 09:35:38 +0200 Subject: [PATCH 2/4] Apply suggestion from @DaanHoogland --- .github/workflows/merge-conflict-checker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml index 2c826a47c7ec..a0ccc5a5db0a 100644 --- a/.github/workflows/merge-conflict-checker.yml +++ b/.github/workflows/merge-conflict-checker.yml @@ -28,6 +28,8 @@ concurrency: jobs: triage: + triage: + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false permissions: pull-requests: write # for eps1lon/actions-label-merge-conflict to label PRs runs-on: ubuntu-22.04 From 4c0f5808d950972b701cc2590a8b4865e255c583 Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 19 May 2026 09:36:29 +0200 Subject: [PATCH 3/4] Apply suggestion from @DaanHoogland --- .github/workflows/merge-conflict-checker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml index a0ccc5a5db0a..502709c5ae87 100644 --- a/.github/workflows/merge-conflict-checker.yml +++ b/.github/workflows/merge-conflict-checker.yml @@ -27,7 +27,6 @@ concurrency: group: "gh-aw-${{ github.workflow }}" jobs: - triage: triage: if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false permissions: From 97ff01beeae90afc739efd14fb3f7334988543ef Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 19 May 2026 09:54:52 +0200 Subject: [PATCH 4/4] Apply suggestion from @DaanHoogland --- .github/workflows/merge-conflict-checker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml index 502709c5ae87..2c826a47c7ec 100644 --- a/.github/workflows/merge-conflict-checker.yml +++ b/.github/workflows/merge-conflict-checker.yml @@ -28,7 +28,6 @@ concurrency: jobs: triage: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false permissions: pull-requests: write # for eps1lon/actions-label-merge-conflict to label PRs runs-on: ubuntu-22.04