Skip to content

Commit f9a19da

Browse files
committed
PR checks: Run integration tests against both tools: null and tools: latest
Always test against both the default and latest CodeQL bundle. This improves test coverage shortly after a CodeQL bundle release, where the latest bundle may not yet be built into the Actions VM image as the default bundle. It also saves a manual step during bundle release testing, since we no longer need to temporarily change the PR checks to `tools: latest`. There is some redundancy when the latest bundle is the same as the default bundle on the VM image, but this can be considered a test for the `tools: latest` configuration.
1 parent 7f9fb10 commit f9a19da

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest,windows-latest,macos-latest]
14+
tools: [~, latest]
1415
runs-on: ${{ matrix.os }}
1516

1617
steps:
@@ -20,6 +21,7 @@ jobs:
2021
with:
2122
languages: javascript
2223
config-file: ./.github/codeql/codeql-config.yml
24+
tools: ${{ matrix.tools }}
2325
# confirm steps.init.outputs.codeql-path points to the codeql binary
2426
- name: Print CodeQL Version
2527
run: ${{steps.init.outputs.codeql-path}} version --format=json

.github/workflows/pr-checks.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ jobs:
117117
fail-fast: false
118118
matrix:
119119
os: [ubuntu-latest, windows-latest, macos-latest]
120+
tools: [~, latest]
120121
runs-on: ${{ matrix.os }}
121122

122123
steps:
@@ -136,6 +137,7 @@ jobs:
136137
with:
137138
languages: go
138139
config-file: ./.github/codeql/custom-queries.yml
140+
tools: ${{ matrix.tools }}
139141
- name: Build code
140142
shell: bash
141143
run: ./build.sh
@@ -149,6 +151,7 @@ jobs:
149151
fail-fast: false
150152
matrix:
151153
os: [ubuntu-latest, windows-latest, macos-latest]
154+
tools: [~, latest]
152155
runs-on: ${{ matrix.os }}
153156
env:
154157
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
@@ -169,6 +172,7 @@ jobs:
169172
- uses: ./../action/init
170173
with:
171174
languages: go
175+
tools: ${{ matrix.tools }}
172176
- name: Build code
173177
shell: bash
174178
run: go build main.go
@@ -178,6 +182,10 @@ jobs:
178182

179183
go-custom-tracing-autobuild:
180184
needs: [check-js, check-node-modules]
185+
strategy:
186+
fail-fast: false
187+
matrix:
188+
tools: [~, latest]
181189
# No need to test Go autobuild on multiple OSes since
182190
# we're testing Go custom tracing with a manual build on all OSes.
183191
runs-on: ubuntu-latest
@@ -196,6 +204,7 @@ jobs:
196204
- uses: ./../action/init
197205
with:
198206
languages: go
207+
tools: ${{ matrix.tools }}
199208
- uses: ./../action/autobuild
200209
- uses: ./../action/analyze
201210
env:
@@ -236,6 +245,10 @@ jobs:
236245

237246
test-proxy:
238247
needs: [check-js, check-node-modules]
248+
strategy:
249+
fail-fast: false
250+
matrix:
251+
tools: [~, latest]
239252
runs-on: ubuntu-latest
240253
container:
241254
image: ubuntu:18.04
@@ -259,6 +272,7 @@ jobs:
259272
- uses: ./../action/init
260273
with:
261274
languages: javascript
275+
tools: ${{ matrix.tools }}
262276
- uses: ./../action/analyze
263277
env:
264278
TEST_MODE: true

0 commit comments

Comments
 (0)