Skip to content

Commit febe990

Browse files
committed
Revert commit 74ff65d
1 parent fae4944 commit febe990

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
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

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

scripts/get_workspace_packs.py

Lines changed: 6 additions & 6 deletions
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-
13+
1414
return packs

0 commit comments

Comments
 (0)