Skip to content

Commit 8b32ffb

Browse files
authored
Update CI pipelines and bump version to 1.8.1. (#193)
* Test script adjustments for new CodeQL version * Update test dependencies * Bump QLPack version * Update README. * Add missing NuGet call Signed-off-by: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> --------- Signed-off-by: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com>
1 parent 21faa42 commit 8b32ffb

6 files changed

Lines changed: 22 additions & 4 deletions

File tree

.github/workflows/build-codeql.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
workflow_dispatch:
1515

1616
env:
17-
CODEQL_VERSION: 2.21.2
17+
CODEQL_VERSION: 2.23.3
1818

1919
jobs:
2020
build:
@@ -98,6 +98,8 @@ jobs:
9898
popd
9999
- name: codeql version test
100100
run: .\codeql-cli\codeql.exe version
101+
- name: Install Nuget Packages
102+
run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\
101103
- name: Setup Python
102104
uses: actions/setup-python@v5
103105
with:
@@ -179,6 +181,8 @@ jobs:
179181
popd
180182
- name: codeql version test
181183
run: .\codeql-cli\codeql.exe version
184+
- name: Install Nuget Packages
185+
run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\
182186
- name: Setup Python
183187
uses: actions/setup-python@v5
184188
with:
@@ -297,6 +301,9 @@ jobs:
297301
popd
298302
- name: Add msbuild to PATH
299303
uses: microsoft/setup-msbuild@v2
304+
305+
- name: Install Nuget Packages
306+
run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\
300307

301308
- name: Test DVL
302309
run: src\drivers\test\dvl_tests\dvl_tests.ps1

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ This repository contains open-source components for supplemental use in developi
1111
#### Validated CodeQL Versions For Use with WHCP
1212
| CodeQL CLI Version |
1313
|--------------------------|
14+
| 2.23.3 |
1415
| 2.21.4 |
1516
| 2.21.2 |
1617
| 2.20.1 |
1718
| 2.15.4 |
1819

20+
When using the precompiled pack, please use the most recent CodeQL CLI version listed above.
21+
1922
*See appendix for more information
2023

2124
### For Testing the Latest in Development

src/drivers/test/build_create_analyze_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ def create_codeql_test_database(ql_test):
400400
source_dir=os.path.join(g_test_dir, "working\\"+ql_test.get_ql_name()+"\\")
401401
db_loc = os.path.join(test_db_dir, ql_test.get_ql_name()+"\\")
402402

403-
codeql_command = [codeql_path, "database", "create", "-l", "cpp", "-s", source_dir, "--threads=0", "-c", "msbuild /p:Platform=x64;UseNTIFS="+ql_test.get_use_ntifs()+
403+
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()+
404404
" /t:rebuild " + source_dir + ql_test.get_template().split("\\")[-1] + ".sln", db_loc]
405405
print_conditionally(" - Database location: " + db_loc)
406406
print_conditionally(" - Source directory: " + source_dir)

src/drivers/test/packages.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.6584" targetFramework="native" />
4+
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.6584" targetFramework="native" />
5+
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.6584" targetFramework="native" />
6+
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.6584" targetFramework="native" />
7+
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.6584" targetFramework="native" />
8+
</packages>

src/drivers/test/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sarif-tools==1.0.0
2-
pandas==2.1.4
2+
pandas==2.3.3
33
openpyxl==3.1.2
44
azure-common==1.1.28
55
azure-core==1.29.7

src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT license.
33

44
name: microsoft/windows-drivers
5-
version: 1.8.0
5+
version: 1.8.1
66
dependencies:
77
codeql/cpp-all: ^4.2.0
88
microsoft/cpp-queries: ^0.0.4

0 commit comments

Comments
 (0)