From 638bc013f9a4d27373121921e73e6ecb00cb9b79 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 12 Apr 2025 13:38:22 -0700 Subject: [PATCH 1/2] Disable CodeQL on merge queue --- .github/workflows/codeql.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b3609e705..506146f99 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -6,7 +6,12 @@ on: - main - release/* pull_request: - merge_group: + # TODO (trask) adding this to the merge queue causes the merge queue to fail + # see related issues + # - https://github.com/github/codeql-action/issues/1572 + # - https://github.com/github/codeql-action/issues/1537 + # - https://github.com/github/codeql-action/issues/2691 + # merge_group: schedule: - cron: "29 13 * * 2" # weekly at 13:29 UTC on Tuesday From e46917073987c3303a1f5241b765e831ece0e443 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 14 Apr 2025 07:11:08 -0700 Subject: [PATCH 2/2] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea28f7692..4bcfa26b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,7 +153,7 @@ jobs: GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} required-status-check: - if: github.event_name == 'pull_request' && always() + if: (github.event_name == 'pull_request' || github.event_name == 'merge_group') && always() needs: - build - test