From 875429c94ea5ff47e2833dd65838596fb8d7755a Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Thu, 26 Feb 2026 17:29:58 +0000 Subject: [PATCH] Fix conditions in code scanning config checks DIff-informed analysis isn't enabled in the merge queue. --- .github/workflows/codescanning-config-cli.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codescanning-config-cli.yml b/.github/workflows/codescanning-config-cli.yml index ca3b554a9f..bf6d90fbf7 100644 --- a/.github/workflows/codescanning-config-cli.yml +++ b/.github/workflows/codescanning-config-cli.yml @@ -80,7 +80,7 @@ jobs: # On PRs, overlay analysis may change the config that is passed to the CLI. # Therefore, we have two variants of the following test, one for PRs and one for other events. - name: Empty file (non-PR) - if: github.event_name != 'pull_request' && github.event_name != 'merge_group' + if: github.event_name != 'pull_request' uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: "{}" @@ -88,7 +88,7 @@ jobs: tools: ${{ steps.prepare-test.outputs.tools-url }} - name: Empty file (PR) - if: github.event_name == 'pull_request' || github.event_name == 'merge_group' + if: github.event_name == 'pull_request' uses: ./../action/.github/actions/check-codescanning-config with: expected-config-file-contents: |