Skip to content

Commit bd8aab3

Browse files
authored
1 parent 3c9e2f8 commit bd8aab3

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

.github/workflows/codeql.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ on:
1717
pull_request:
1818
# The branches below must be a subset of the branches above
1919
branches: ["main"]
20+
merge_group:
21+
branches: [main]
2022
schedule:
2123
- cron: "34 12 * * 5"
2224

2325
jobs:
2426
analyze:
2527
name: Analyze
2628
runs-on: ubuntu-latest
29+
if: ${{ github.event_name == 'pull_request' }}
30+
# only run job if workflow initiated by a pull request event
31+
# see https://github.com/cursorless-dev/cursorless/issues/1338
2732
permissions:
2833
actions: read
2934
contents: read
@@ -73,3 +78,23 @@ jobs:
7378
uses: github/codeql-action/analyze@v2
7479
with:
7580
category: "/language:${{matrix.language}}"
81+
82+
analyze_merge_group:
83+
name: Analyze
84+
runs-on: ubuntu-latest
85+
if: ${{ github.event_name == 'merge_group' }}
86+
# If we're on a merge queue, we just force a pass, as it already ran on the PR
87+
# see https://github.com/cursorless-dev/cursorless/issues/1338
88+
89+
strategy:
90+
fail-fast: false
91+
matrix:
92+
language: ["javascript", "python"]
93+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
94+
# Use only 'java' to analyze code written in Java, Kotlin or both
95+
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
96+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
97+
98+
steps:
99+
- name: Checkout repository
100+
uses: actions/checkout@v3

.github/workflows/test-docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Test docs
33
on:
44
pull_request:
55
types: [opened, synchronize, reopened]
6+
merge_group:
7+
branches: [main]
68

79
jobs:
810
test-docs-build:

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- main
77
pull_request:
88
types: [opened, synchronize, reopened]
9+
merge_group:
10+
branches: [main]
911

1012
jobs:
1113
test:

0 commit comments

Comments
 (0)