Skip to content

Commit d3d4bd3

Browse files
committed
Revert "Replace .codeqlmanifest.json with codeql-workspace.yml"
This reverts commit f515ab5.
1 parent f515ab5 commit d3d4bd3

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

.codeqlmanifest.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "provide": [ "cpp/*/src/qlpack.yml", "cpp/*/test/qlpack.yml", "c/*/src/qlpack.yml", "c/*/test/qlpack.yml", "scripts/generate_modules/queries/qlpack.yml" ] }

.github/workflows/code-scanning-pack-gen.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ jobs:
8787
run: |
8888
PATH=$PATH:$CODEQL_HOME/codeql
8989
90-
find c -name qlpack.yml -exec codeql pack create --threads=0 {} \;
91-
find cpp -name qlpack.yml -exec codeql pack create --threads=0 {} \;
90+
codeql query compile --threads 0 cpp
91+
codeql query compile --threads 0 c
9292
9393
cd ..
94-
zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/codeql-workspace.yml codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/schemas
94+
zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/schemas
9595
9696
- name: Upload GHAS Query Pack
9797
uses: actions/upload-artifact@v2

codeql-workspace.yml

-7
This file was deleted.

scripts/get_workspace_packs.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import glob
2-
import yaml
2+
import json
33
import os
44

55
def get_workspace_packs(root):
6-
# Find the packs by globbing using the 'provide' patterns in the CodeQL workspace file.
6+
# Find the packs by globbing using the 'provide' patterns in the manifest.
77
os.chdir(root)
8-
with open('codeql-workspace.yml') as codeql_workspace_file:
9-
codeql_workspace = yaml.load(codeql_workspace_file)
8+
with open('.codeqlmanifest.json') as manifest_file:
9+
manifest = json.load(manifest_file)
1010
packs = []
11-
for pattern in codeql_workspace['provide']:
11+
for pattern in manifest['provide']:
1212
packs.extend(glob.glob(pattern, recursive=True))
13-
14-
return packs
13+
14+
return packs

0 commit comments

Comments
 (0)