Skip to content

Commit 77c3d25

Browse files
authored
Merge pull request #3112 from github/henrymercer/scan-python
CI: Configure Python analysis
2 parents aa90e97 + 1069ace commit 77c3d25

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

.github/codeql/codeql-actions-config.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/codeql/codeql-config.yml renamed to .github/codeql/codeql-config-javascript.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ queries:
77
# we include both even though one is a superset of the
88
# other, because we're testing the parsing logic and
99
# that the suites exist in the codeql bundle.
10+
- uses: security-and-quality
1011
- uses: security-experimental
1112
- uses: security-extended
12-
- uses: security-and-quality
1313
paths-ignore:
14-
- tests
1514
- lib
15+
- tests

.github/workflows/codeql.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
id: init
9696
with:
9797
languages: javascript
98-
config-file: ./.github/codeql/codeql-config.yml
98+
config-file: ./.github/codeql/codeql-config-javascript.yml
9999
tools: ${{ matrix.tools }}
100100
# confirm steps.init.outputs.codeql-path points to the codeql binary
101101
- name: Print CodeQL Version
@@ -107,13 +107,17 @@ jobs:
107107
uses: ./analyze
108108
with:
109109
category: "/language:javascript"
110+
upload: ${{ (matrix.os == 'ubuntu-24.04' && !matrix.tools && 'always') || 'never' }}
110111

111-
112-
analyze-actions:
112+
analyze-other:
113113
runs-on: ubuntu-latest
114114

115115
strategy:
116116
fail-fast: false
117+
matrix:
118+
include:
119+
- language: actions
120+
- language: python
117121

118122
permissions:
119123
contents: read
@@ -125,9 +129,15 @@ jobs:
125129
- name: Initialize CodeQL
126130
uses: ./init
127131
with:
128-
languages: actions
129-
config-file: ./.github/codeql/codeql-actions-config.yml
132+
languages: ${{ matrix.language }}
133+
build-mode: none
134+
config: >
135+
paths-ignore:
136+
- lib
137+
- tests
138+
queries:
139+
- uses: security-and-quality
130140
- name: Perform CodeQL Analysis
131141
uses: ./analyze
132142
with:
133-
category: "/language:actions"
143+
category: "/language:${{ matrix.language }}"

0 commit comments

Comments
 (0)