Skip to content

Commit 222253f

Browse files
authored
Merge pull request github#19079 from d10c/d10c/rtjo-language-tests
CI: Add RTJO tests for Go and Ruby
2 parents c3bc651 + 659eaf8 commit 222253f

File tree

4 files changed

+69
-3
lines changed

4 files changed

+69
-3
lines changed

.github/workflows/go-tests-rtjo.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "Go: Run RTJO Tests"
2+
on:
3+
pull_request:
4+
types:
5+
- labeled
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
test-linux:
12+
if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
13+
name: RTJO Test Linux (Ubuntu)
14+
runs-on: ubuntu-latest-xl
15+
steps:
16+
- name: Check out code
17+
uses: actions/checkout@v4
18+
- name: Run tests
19+
uses: ./go/actions/test
20+
with:
21+
run-code-checks: true
22+
dynamic-join-order-mode: all
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: "Ruby: Run RTJO Language Tests"
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
- labeled
10+
11+
env:
12+
CARGO_TERM_COLOR: always
13+
14+
defaults:
15+
run:
16+
working-directory: ruby
17+
18+
permissions:
19+
contents: read
20+
21+
jobs:
22+
qltest-rtjo:
23+
if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
24+
runs-on: ubuntu-latest-xl
25+
strategy:
26+
fail-fast: false
27+
steps:
28+
- uses: actions/checkout@v4
29+
- uses: ./.github/actions/fetch-codeql
30+
- uses: ./ruby/actions/create-extractor-pack
31+
- name: Cache compilation cache
32+
id: query-cache
33+
uses: ./.github/actions/cache-query-compilation
34+
with:
35+
key: ruby-qltest
36+
- name: Run QL tests
37+
run: |
38+
codeql test run --dynamic-join-order-mode=all --threads=0 --ram 50000 --search-path "${{ github.workspace }}" --check-databases --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
39+
env:
40+
GITHUB_TOKEN: ${{ github.token }}

go/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ ql/lib/go.dbscheme.stats: ql/lib/go.dbscheme build/stats/src.stamp extractor
5252
codeql dataset measure -o $@ build/stats/database/db-go
5353

5454
test: all build/testdb/check-upgrade-path
55-
codeql test run -j0 ql/test --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
55+
codeql test run -j0 ql/test --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
5656
# use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
57-
env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
57+
env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
5858
cd extractor; $(BAZEL) test ...
5959
bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
6060

go/actions/test/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ inputs:
99
description: Whether to run formatting, code and qhelp generation checks
1010
required: false
1111
default: false
12+
dynamic-join-order-mode:
13+
description: Value of the --dynamic-join-order-mode flag to pass to the codeql test command
14+
required: false
15+
default: "none"
1216
runs:
1317
using: composite
1418
steps:
@@ -74,4 +78,4 @@ runs:
7478
shell: bash
7579
run: |
7680
cd go
77-
make test cache="${{ steps.query-cache.outputs.cache-dir }}"
81+
make test cache="${{ steps.query-cache.outputs.cache-dir }}" rtjo=${{ inputs.dynamic-join-order-mode }}

0 commit comments

Comments
 (0)