Skip to content

Commit cf57eb8

Browse files
committed
update codeql-action version in QL-for-QL
1 parent e12b6df commit cf57eb8

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- name: Find codeql
1818
id: find-codeql
19-
uses: github/codeql-action/init@erik-krogh/ql
19+
uses: github/codeql-action/init@erik-krogh/newQl
2020
with:
2121
languages: javascript # does not matter
2222
- name: Get CodeQL version
@@ -159,7 +159,7 @@ jobs:
159159
PACK: ${{ runner.temp }}/pack
160160
- name: Hack codeql-action options
161161
run: |
162-
JSON=$(jq -nc --arg pack "${PACK}" '.resolve.queries=["--search-path", $pack] | .resolve.extractor=["--search-path", $pack] | .database.init=["--search-path", $pack]')
162+
JSON=$(jq -nc --arg pack "${PACK}" '.database."run-queries"=["--search-path", $pack] | .resolve.queries=["--search-path", $pack] | .resolve.extractor=["--search-path", $pack] | .database.init=["--search-path", $pack]')
163163
echo "CODEQL_ACTION_EXTRA_OPTIONS=${JSON}" >> ${GITHUB_ENV}
164164
env:
165165
PACK: ${{ runner.temp }}/pack
@@ -171,22 +171,24 @@ jobs:
171171
echo "paths:" > ${CONF}
172172
echo " - ${FOLDER}" >> ${CONF}
173173
echo "paths-ignore:" >> ${CONF}
174-
echo " - ql/ql/test" >> ${CONF}
174+
echo " - ql/ql/test" >> ${CONF}
175+
echo "disable-default-queries: true" >> ${CONF}
176+
echo "packs:" >> ${CONF}
177+
echo " - codeql/ql" >> ${CONF}
175178
echo "Config file: "
176179
cat ${CONF}
177180
env:
178181
CONF: ./ql-for-ql-config.yml
179182
FOLDER: ${{ matrix.folder }}
180-
181183
- name: Initialize CodeQL
182-
uses: github/codeql-action/init@erik-krogh/ql
184+
uses: github/codeql-action/init@erik-krogh/newQl
183185
with:
184186
languages: ql
185187
db-location: ${{ runner.temp }}/db
186188
config-file: ./ql-for-ql-config.yml
187189

188190
- name: Perform CodeQL Analysis
189-
uses: github/codeql-action/analyze@erik-krogh/ql
191+
uses: github/codeql-action/analyze@erik-krogh/newQl
190192
with:
191193
category: "ql-for-ql-${{ matrix.folder }}"
192194
- name: Copy sarif file to CWD

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Find codeql
2828
id: find-codeql
29-
uses: github/codeql-action/init@erik-krogh/ql
29+
uses: github/codeql-action/init@erik-krogh/newQl
3030
with:
3131
languages: javascript # does not matter
3232
- uses: actions/cache@v2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v2
2121
- name: Find codeql
2222
id: find-codeql
23-
uses: github/codeql-action/init@erik-krogh/ql
23+
uses: github/codeql-action/init@erik-krogh/newQl
2424
with:
2525
languages: javascript # does not matter
2626
- uses: actions/cache@v2

0 commit comments

Comments
 (0)