Skip to content

Commit 14efda1

Browse files
authored
Disable CodeQL on merge queue (#1847)
1 parent 0f65ece commit 14efda1

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
154154

155155
required-status-check:
156-
if: github.event_name == 'pull_request' && always()
156+
if: (github.event_name == 'pull_request' || github.event_name == 'merge_group') && always()
157157
needs:
158158
- build
159159
- test

.github/workflows/codeql.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ on:
66
- main
77
- release/*
88
pull_request:
9-
merge_group:
9+
# TODO (trask) adding this to the merge queue causes the merge queue to fail
10+
# see related issues
11+
# - https://github.com/github/codeql-action/issues/1572
12+
# - https://github.com/github/codeql-action/issues/1537
13+
# - https://github.com/github/codeql-action/issues/2691
14+
# merge_group:
1015
schedule:
1116
- cron: "29 13 * * 2" # weekly at 13:29 UTC on Tuesday
1217

0 commit comments

Comments
 (0)