Skip to content

Commit 7976d74

Browse files
committed
ATM: Simplify DB path definition and improve quoting
1 parent 35a4d31 commit 7976d74

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/atm-check-queries-run.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: ATM Check Queries Run
22

33
env:
4-
DB_PATH: test_db
54
QUERY_PACK: javascript/ql/experimental/adaptivethreatmodeling/src
65
QUERY_SUITE: codeql-suites/javascript-atm-code-scanning.qls
76

@@ -27,22 +26,23 @@ jobs:
2726
- name: Install ATM model
2827
run: |
2928
set -exu
30-
31-
# Install dependencies of ATM query pack
32-
codeql pack install ${QUERY_PACK}
29+
30+
# Install dependencies of ATM query pack, i.e. the ATM model
31+
codeql pack install "${QUERY_PACK}"
3332
3433
# Retrieve model checksum
35-
model_checksum=$(codeql resolve extensions ${QUERY_PACK}/${QUERY_SUITE} | jq -r '.models[0].checksum')
34+
model_checksum=$(codeql resolve extensions "${QUERY_PACK}/${QUERY_SUITE}" | jq -r '.models[0].checksum')
3635
3736
# Trust the model so that we can use it in the ATM boosted queries
3837
mkdir -p "$HOME/.config/codeql"
3938
echo "--insecurely-execute-ml-model-checksums ${model_checksum}" >> "$HOME/.config/codeql/config"
4039
4140
- name: Create test DB
4241
run: |
43-
codeql database create ${RUNNER_TEMP}/${DB_PATH} --source-root config/atm/ --language javascript
42+
DB_PATH="${RUNNER_TEMP}/db"
43+
codeql database create "${DB_PATH}" --source-root config/atm --language javascript
44+
echo "DB_PATH=${DB_PATH}" >> "${GITHUB_ENV}"
4445
4546
- name: Run ATM query suite
4647
run: |
47-
codeql database run-queries -vv -- ${RUNNER_TEMP}/${DB_PATH} ${QUERY_PACK}/${QUERY_SUITE}
48-
48+
codeql database run-queries -vv -- "${DB_PATH}" "${QUERY_PACK}/${QUERY_SUITE}"

0 commit comments

Comments
 (0)