Skip to content

Commit a6827a3

Browse files
henrymercerCopilot
andcommitted
Merge analyze-javascript and analyze-other into one matrixed job
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 97d0cc0 commit a6827a3

2 files changed

Lines changed: 16 additions & 37 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
paths-ignore:
2+
- lib
3+
- tests
4+
queries:
5+
- uses: security-and-quality

‎.github/workflows/codeql.yml‎

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@ env:
1919
CODEQL_ACTION_TESTING_ENVIRONMENT: codeql-action-pr-checks
2020

2121
jobs:
22-
analyze-javascript:
22+
analyze:
2323
if: github.triggering_actor != 'dependabot[bot]'
2424
runs-on: ubuntu-26.04
2525

26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
language:
30+
- actions
31+
- javascript
32+
2633
permissions:
2734
contents: read
2835
security-events: write
@@ -34,48 +41,15 @@ jobs:
3441
uses: ./init
3542
id: init
3643
with:
37-
languages: javascript
38-
config-file: ./.github/codeql/codeql-config-javascript.yml
44+
languages: ${{ matrix.language }}
45+
build-mode: none
46+
config-file: ./.github/codeql/codeql-config-${{ matrix.language }}.yml
3947
# confirm steps.init.outputs.codeql-path points to the codeql binary
4048
- name: Print CodeQL Version
4149
run: >
4250
"$CODEQL" version --format=json
4351
env:
4452
CODEQL: ${{steps.init.outputs.codeql-path}}
45-
- name: Perform CodeQL Analysis
46-
uses: ./analyze
47-
with:
48-
category: "/language:javascript"
49-
upload: ${{ (github.event_name != 'merge_group' && 'always') || 'never' }}
50-
51-
analyze-other:
52-
if: github.triggering_actor != 'dependabot[bot]'
53-
runs-on: ubuntu-26.04
54-
55-
strategy:
56-
fail-fast: false
57-
matrix:
58-
include:
59-
- language: actions
60-
61-
permissions:
62-
contents: read
63-
security-events: write
64-
65-
steps:
66-
- name: Checkout
67-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
68-
- name: Initialize CodeQL
69-
uses: ./init
70-
with:
71-
languages: ${{ matrix.language }}
72-
build-mode: none
73-
config: >
74-
paths-ignore:
75-
- lib
76-
- tests
77-
queries:
78-
- uses: security-and-quality
7953
- name: Perform CodeQL Analysis
8054
uses: ./analyze
8155
with:

0 commit comments

Comments
 (0)