Skip to content

Commit 1efaede

Browse files
committed
Add CodeQL query format check to CI
1 parent d9b8058 commit 1efaede

File tree

4 files changed

+34
-19
lines changed

4 files changed

+34
-19
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ jobs:
1616
version: '2.23.8'
1717
platform: 'linux64'
1818
checksum: 'e61bc8aa8d86d45acd9d1c36629a12bbfb3365cd07a31666a2ebc91c6a1940b2'
19-
- run: |
20-
codeql test run --threads=0 ./cpp/test/
21-
codeql test run --threads=0 ./go/test/
22-
codeql test run --threads=0 ./java/test/
19+
- run: make format-check
20+
- run: make test

Makefile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
test:
2+
find . -iname "test" -type d -maxdepth 2 -mindepth 2 -print0 | \
3+
xargs -0 codeql test run --threads=0
4+
5+
format:
6+
find . \( -iname '*.ql' -o -iname '*.qll' \) -print0 | \
7+
xargs -0 codeql query format --in-place
8+
9+
format-check:
10+
find . \( -iname '*.ql' -o -iname '*.qll' \) -print0 | \
11+
xargs -0 codeql query format --check-only
12+
13+
pack-install:
14+
find . -iname "qlpack.yml" -exec \
15+
sh -c 'codeql pack install $$(dirname "$$1")' sh {} \;
16+
17+
pack-upgrade:
18+
find . -iname "qlpack.yml" -exec \
19+
sh -c 'codeql pack upgrade $$(dirname "$$1")' sh {} \;
20+
21+
.PHONY: test format format-check pack-install pack-upgrade

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,21 @@ codeql resolve packs | grep trailofbits
103103
#### Before committing
104104

105105
Run tests:
106+
107+
```sh
108+
make test
109+
```
110+
111+
Format queries:
112+
106113
```sh
107-
cd codeql-queries
108-
codeql test run ./cpp/test
109-
codeql test run ./go/test
110-
codeql test run ./java/test
114+
make format
111115
```
112116

113-
Update dependencies:
117+
Install dependencies:
118+
114119
```sh
115-
bash ./scripts/install_all.sh
120+
make install
116121
```
117122

118123
Generate query tables and copy-paste it to README.md file

scripts/install_all.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)