Skip to content

Commit ae8955c

Browse files
committed
fix: resolve CodeQL local script syntax and memory issues
1 parent 43c76fb commit ae8955c

1 file changed

Lines changed: 44 additions & 44 deletions

File tree

scripts/codeql_local.sh

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ mkdir -p .tmp/codeql
1616
echo "==> Ensuring CodeQL standard query packs are available"
1717
codeql pack download codeql/javascript-queries codeql/python-queries codeql/actions-queries
1818

19-
# Stable defaults for local runs.
20-
CODEQL_JS_RAM_MB="${CODEQL_JS_RAM_MB:-6144}"
19+
# Stable defaults for local runs (set to 2GB as requested to avoid OOM)
20+
CODEQL_JS_RAM_MB="${CODEQL_JS_RAM_MB:-2048}"
2121
CODEQL_JS_THREADS="${CODEQL_JS_THREADS:-2}"
22-
CODEQL_PY_RAM_MB="${CODEQL_PY_RAM_MB:-4096}"
22+
CODEQL_PY_RAM_MB="${CODEQL_PY_RAM_MB:-2048}"
2323
CODEQL_ACTIONS_RAM_MB="${CODEQL_ACTIONS_RAM_MB:-1024}"
2424

2525
# Strategy github/security-and-quality
@@ -30,28 +30,28 @@ run_js() {
3030
echo " using --ram=${CODEQL_JS_RAM_MB}MB --threads=${CODEQL_JS_THREADS}"
3131
rm -rf .tmp/codeql/js-db
3232
chmod +x scripts/codeql_js_build.sh
33-
codeql database create .tmp/codeql/js-db
34-
--language=javascript-typescript
35-
--ram="$CODEQL_JS_RAM_MB"
33+
codeql database create .tmp/codeql/js-db \
34+
--language=javascript \
35+
--ram="$CODEQL_JS_RAM_MB" \
3636
--command="./scripts/codeql_js_build.sh"
3737

3838
if [[ "$CODEQL_QUERY_STRATEGY" == "security-and-quality" ]]; then
39-
codeql database analyze .tmp/codeql/js-db
40-
codeql/javascript-queries:codeql-suites/javascript-security-and-quality.qls
41-
--download
42-
--ram="$CODEQL_JS_RAM_MB"
43-
--threads="$CODEQL_JS_THREADS"
44-
--format=sarifv2.1.0
45-
--sarif-category="/language:javascript-typescript"
39+
codeql database analyze .tmp/codeql/js-db \
40+
codeql/javascript-queries:codeql-suites/javascript-security-and-quality.qls \
41+
--download \
42+
--ram="$CODEQL_JS_RAM_MB" \
43+
--threads="$CODEQL_JS_THREADS" \
44+
--format=sarifv2.1.0 \
45+
--sarif-category="/language:javascript" \
4646
--output .tmp/codeql/javascript.sarif
4747
else
48-
codeql database analyze .tmp/codeql/js-db
49-
codeql/javascript-queries
50-
--download
51-
--ram="$CODEQL_JS_RAM_MB"
52-
--threads="$CODEQL_JS_THREADS"
53-
--format=sarifv2.1.0
54-
--sarif-category="/language:javascript-typescript"
48+
codeql database analyze .tmp/codeql/js-db \
49+
codeql/javascript-queries \
50+
--download \
51+
--ram="$CODEQL_JS_RAM_MB" \
52+
--threads="$CODEQL_JS_THREADS" \
53+
--format=sarifv2.1.0 \
54+
--sarif-category="/language:javascript" \
5555
--output .tmp/codeql/javascript.sarif
5656
fi
5757
}
@@ -61,26 +61,26 @@ run_py() {
6161
echo " using --ram=${CODEQL_PY_RAM_MB}MB"
6262
rm -rf .tmp/codeql/py-db
6363
chmod +x scripts/codeql_py_build.sh
64-
codeql database create .tmp/codeql/py-db
65-
--language=python
66-
--ram="$CODEQL_PY_RAM_MB"
64+
codeql database create .tmp/codeql/py-db \
65+
--language=python \
66+
--ram="$CODEQL_PY_RAM_MB" \
6767
--command="./scripts/codeql_py_build.sh"
6868

6969
if [[ "$CODEQL_QUERY_STRATEGY" == "security-and-quality" ]]; then
70-
codeql database analyze .tmp/codeql/py-db
71-
codeql/python-queries:codeql-suites/python-security-and-quality.qls
72-
--download
73-
--ram="$CODEQL_PY_RAM_MB"
74-
--format=sarifv2.1.0
75-
--sarif-category="/language:python"
70+
codeql database analyze .tmp/codeql/py-db \
71+
codeql/python-queries:codeql-suites/python-security-and-quality.qls \
72+
--download \
73+
--ram="$CODEQL_PY_RAM_MB" \
74+
--format=sarifv2.1.0 \
75+
--sarif-category="/language:python" \
7676
--output .tmp/codeql/python.sarif
7777
else
78-
codeql database analyze .tmp/codeql/py-db
79-
codeql/python-queries
80-
--download
81-
--ram="$CODEQL_PY_RAM_MB"
82-
--format=sarifv2.1.0
83-
--sarif-category="/language:python"
78+
codeql database analyze .tmp/codeql/py-db \
79+
codeql/python-queries \
80+
--download \
81+
--ram="$CODEQL_PY_RAM_MB" \
82+
--format=sarifv2.1.0 \
83+
--sarif-category="/language:python" \
8484
--output .tmp/codeql/python.sarif
8585
fi
8686
}
@@ -89,17 +89,17 @@ run_actions() {
8989
echo "==> CodeQL (Actions)"
9090
echo " using --ram=${CODEQL_ACTIONS_RAM_MB}MB"
9191
rm -rf .tmp/codeql/actions-db
92-
codeql database create .tmp/codeql/actions-db
93-
--language=actions
94-
--build-mode=none
92+
codeql database create .tmp/codeql/actions-db \
93+
--language=actions \
94+
--build-mode=none \
9595
--ram="$CODEQL_ACTIONS_RAM_MB"
9696

97-
codeql database analyze .tmp/codeql/actions-db
98-
codeql/actions-queries
99-
--download
100-
--ram="$CODEQL_ACTIONS_RAM_MB"
101-
--format=sarifv2.1.0
102-
--sarif-category="/language:actions"
97+
codeql database analyze .tmp/codeql/actions-db \
98+
codeql/actions-queries \
99+
--download \
100+
--ram="$CODEQL_ACTIONS_RAM_MB" \
101+
--format=sarifv2.1.0 \
102+
--sarif-category="/language:actions" \
103103
--output .tmp/codeql/actions.sarif
104104
}
105105

0 commit comments

Comments
 (0)