Skip to content

Commit 1b98661

Browse files
committed
QL: fix test workflow
1 parent be076dc commit 1b98661

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

.github/workflows/ql-for-ql-tests.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,23 @@ jobs:
3030
~/.cargo/git
3131
ql/target
3232
key: ${{ runner.os }}-qltest-cargo-${{ hashFiles('**/Cargo.lock') }}
33-
- name: Build Extractor
34-
run: cd ql; env "PATH=$PATH:`dirname ${CODEQL}`" ./create-extractor-pack.sh
35-
env:
36-
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
33+
- name: Build extractor
34+
run: |
35+
cd ql;
36+
codeqlpath=$(dirname ${{ steps.find-codeql.outputs.codeql-path }});
37+
env "PATH=$PATH:$codeqlpath" ./create-extractor-pack.sh
3738
- name: Run QL tests
38-
run: "${CODEQL}" test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path "${{ github.workspace }}"/ql --consistency-queries ql/ql/consistency-queries ql/ql/test
39+
run: |
40+
"${CODEQL}" test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path "${{ github.workspace }}"/ql --consistency-queries ql/ql/consistency-queries ql/ql/test
3941
env:
4042
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
4143
- name: Check QL formatting
42-
run: find ql/ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 "${CODEQL}" query format --check-only
44+
run: |
45+
find ql/ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 "${CODEQL}" query format --check-only
4346
env:
4447
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
4548
- name: Check QL compilation
46-
run: "${CODEQL}" query compile --check-only --threads=4 --warnings=error --search-path "${{ github.workspace }}" "ql/ql/src" "ql/ql/examples"
49+
run: |
50+
"${CODEQL}" query compile --check-only --threads=4 --warnings=error --search-path "${{ github.workspace }}/ql/extractor-pack" "ql/ql/src" "ql/ql/examples"
4751
env:
4852
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}

0 commit comments

Comments
 (0)