Skip to content

Fix build breaks in .github/workflows/ci.yaml #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkSchofield merged 3 commits into from
Sep 22, 2023
Merged

Fix build breaks in .github/workflows/ci.yaml #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d80bb44
Explicitly install 'ninja' to ensure that it is available for builds
MarkSchofield Sep 22, 2023
01d27c9
Fix analyze.ps1 - update regex to match errors
MarkSchofield Sep 22, 2023
fce7e81
Fix cmake-format errors
MarkSchofield Sep 22, 2023
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Ninja
shell: pwsh
run: |
choco install ninja
- name: CMake Configure ${{ matrix.buildPreset }}
shell: pwsh
run: |
Expand Down
2 changes: 1 addition & 1 deletion Windows.Kits.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ endif()
if(NOT CMAKE_WINDOWS_KITS_10_DIR)
get_filename_component(CMAKE_WINDOWS_KITS_10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]" ABSOLUTE CACHE)
if ("${CMAKE_WINDOWS_KITS_10_DIR}" STREQUAL "/registry")
unset(CMAKE_WINDOWS_KITS_10_DIR)
unset(CMAKE_WINDOWS_KITS_10_DIR)
endif()
endif()

Expand Down
16 changes: 8 additions & 8 deletions Windows.MSVC.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ endif()
# Find Visual Studio
#
if(NOT VS_INSTALLATION_PATH)
findVisualStudio(
VERSION ${CMAKE_VS_VERSION_RANGE}
PRERELEASE ${CMAKE_VS_VERSION_PRERELEASE}
PRODUCTS ${CMAKE_VS_PRODUCTS}
PROPERTIES
installationVersion VS_INSTALLATION_VERSION
installationPath VS_INSTALLATION_PATH
)
findVisualStudio(
VERSION ${CMAKE_VS_VERSION_RANGE}
PRERELEASE ${CMAKE_VS_VERSION_PRERELEASE}
PRODUCTS ${CMAKE_VS_PRODUCTS}
PROPERTIES
installationVersion VS_INSTALLATION_VERSION
installationPath VS_INSTALLATION_PATH
)
endif()

message(VERBOSE "VS_INSTALLATION_VERSION = ${VS_INSTALLATION_VERSION}")
Expand Down
2 changes: 1 addition & 1 deletion analyze.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $Failed = $false;
ForEach-Object {
& $CMakeLint $_ |
ForEach-Object {
if ($_ -match '^([^:]*):(\d+):(.*)$') {
if ($_ -match '^([^:]*):(\d+)(,\d+)?:(.*)$') {
ReportError -File $Matches[1] -LineNumber $Matches[2] -Message $_
$Failed = $true
} else {
Expand Down