Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/build-codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
workflow_dispatch:

env:
CODEQL_VERSION: 2.21.2
CODEQL_VERSION: 2.23.3

jobs:
build:
Expand Down Expand Up @@ -98,6 +98,8 @@ jobs:
popd
- name: codeql version test
run: .\codeql-cli\codeql.exe version
- name: Install Nuget Packages
run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\
- name: Setup Python
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -179,6 +181,8 @@ jobs:
popd
- name: codeql version test
run: .\codeql-cli\codeql.exe version
- name: Install Nuget Packages
run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\
- name: Setup Python
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -297,6 +301,9 @@ jobs:
popd
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Install Nuget Packages
run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\

- name: Test DVL
run: src\drivers\test\dvl_tests\dvl_tests.ps1
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ This repository contains open-source components for supplemental use in developi
#### Validated CodeQL Versions For Use with WHCP
| CodeQL CLI Version |
|--------------------------|
| 2.23.3 |
| 2.21.4 |
| 2.21.2 |
| 2.20.1 |
| 2.15.4 |

When using the precompiled pack, please use the most recent CodeQL CLI version listed above.

*See appendix for more information

### For Testing the Latest in Development
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/test/build_create_analyze_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def create_codeql_test_database(ql_test):
source_dir=os.path.join(g_test_dir, "working\\"+ql_test.get_ql_name()+"\\")
db_loc = os.path.join(test_db_dir, ql_test.get_ql_name()+"\\")

codeql_command = [codeql_path, "database", "create", "-l", "cpp", "-s", source_dir, "--threads=0", "-c", "msbuild /p:Platform=x64;UseNTIFS="+ql_test.get_use_ntifs()+
codeql_command = [codeql_path, "database", "create", "-l", "cpp", "-s", source_dir, "--threads=0", "-c", "msbuild /p:Platform=x64 /p:UseNTIFS="+ql_test.get_use_ntifs()+
" /t:rebuild " + source_dir + ql_test.get_template().split("\\")[-1] + ".sln", db_loc]
print_conditionally(" - Database location: " + db_loc)
print_conditionally(" - Source directory: " + source_dir)
Expand Down
8 changes: 8 additions & 0 deletions src/drivers/test/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.6584" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.6584" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.6584" targetFramework="native" />
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.6584" targetFramework="native" />
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.6584" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion src/drivers/test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sarif-tools==1.0.0
pandas==2.1.4
pandas==2.3.3
openpyxl==3.1.2
azure-common==1.1.28
azure-core==1.29.7
Expand Down
2 changes: 1 addition & 1 deletion src/qlpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the MIT license.

name: microsoft/windows-drivers
version: 1.8.0
version: 1.8.1
dependencies:
codeql/cpp-all: ^4.2.0
microsoft/cpp-queries: ^0.0.4
Expand Down
Loading