Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
PR checks: Run integration tests against both tools: null and `tool…
…s: 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.
Aditya Sharad committed Apr 8, 2021
1 parent 7f9fb10 commit f9a19da
Showing 2 changed files with 16 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/codeql.yml
@@ -11,6 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest,windows-latest,macos-latest]
tools: [~, latest]
runs-on: ${{ matrix.os }}

steps:
@@ -20,6 +21,7 @@ jobs:
with:
languages: javascript
config-file: ./.github/codeql/codeql-config.yml
tools: ${{ matrix.tools }}
# confirm steps.init.outputs.codeql-path points to the codeql binary
- name: Print CodeQL Version
run: ${{steps.init.outputs.codeql-path}} version --format=json
14 changes: 14 additions & 0 deletions .github/workflows/pr-checks.yml
@@ -117,6 +117,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
tools: [~, latest]
runs-on: ${{ matrix.os }}

steps:
@@ -136,6 +137,7 @@ jobs:
with:
languages: go
config-file: ./.github/codeql/custom-queries.yml
tools: ${{ matrix.tools }}
- name: Build code
shell: bash
run: ./build.sh
@@ -149,6 +151,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
tools: [~, latest]
runs-on: ${{ matrix.os }}
env:
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
@@ -169,6 +172,7 @@ jobs:
- uses: ./../action/init
with:
languages: go
tools: ${{ matrix.tools }}
- name: Build code
shell: bash
run: go build main.go
@@ -178,6 +182,10 @@ jobs:

go-custom-tracing-autobuild:
needs: [check-js, check-node-modules]
strategy:
fail-fast: false
matrix:
tools: [~, latest]
# No need to test Go autobuild on multiple OSes since
# we're testing Go custom tracing with a manual build on all OSes.
runs-on: ubuntu-latest
@@ -196,6 +204,7 @@ jobs:
- uses: ./../action/init
with:
languages: go
tools: ${{ matrix.tools }}
- uses: ./../action/autobuild
- uses: ./../action/analyze
env:
@@ -236,6 +245,10 @@ jobs:

test-proxy:
needs: [check-js, check-node-modules]
strategy:
fail-fast: false
matrix:
tools: [~, latest]
runs-on: ubuntu-latest
container:
image: ubuntu:18.04
@@ -259,6 +272,7 @@ jobs:
- uses: ./../action/init
with:
languages: javascript
tools: ${{ matrix.tools }}
- uses: ./../action/analyze
env:
TEST_MODE: true

0 comments on commit f9a19da

Please sign in to comment.