From e071914e83fb286e30619770aba30b8641e3adcb Mon Sep 17 00:00:00 2001 From: scawful Date: Wed, 15 Oct 2025 09:13:20 -0400 Subject: [PATCH] fix(ci): update Ninja version command in CI and release workflows - Modified the Ninja version command in both CI and release workflows to ensure the correct environment path is set before executing the version check. - This change enhances the reliability of the Ninja installation process on Windows. Benefits: - Improves the setup process for Windows environments by ensuring accurate feedback on the Ninja installation, leading to more efficient builds. --- .github/workflows/ci.yml | 3 ++- .github/workflows/release.yml | 3 ++- cmake/grpc.cmake | 2 +- vcpkg.json | 9 +-------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3b8748c..b5054d7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,8 @@ jobs: } Write-Host "Ninja installed at $ninjaExe" "$ninjaDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - ninja --version + $env:PATH = "$ninjaDir;$env:PATH" + & $ninjaExe --version - name: Set up vcpkg (Windows) if: runner.os == 'Windows' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00bcef61..9a418c89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -158,7 +158,8 @@ jobs: } Write-Host "Ninja installed at $ninjaExe" "$ninjaDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - ninja --version + $env:PATH = "$ninjaDir;$env:PATH" + & $ninjaExe --version - name: "Set up vcpkg (Windows only)" if: runner.os == 'Windows' diff --git a/cmake/grpc.cmake b/cmake/grpc.cmake index a84ac34d..c8de9174 100644 --- a/cmake/grpc.cmake +++ b/cmake/grpc.cmake @@ -74,7 +74,7 @@ set(gRPC_BUILD_GRPC_PYTHON_PLUGIN OFF CACHE BOOL "" FORCE) set(gRPC_BUILD_GRPC_RUBY_PLUGIN OFF CACHE BOOL "" FORCE) set(gRPC_BENCHMARK_PROVIDER "none" CACHE STRING "" FORCE) -set(gRPC_ZLIB_PROVIDER "package" CACHE STRING "" FORCE) +set(gRPC_ZLIB_PROVIDER "module" CACHE STRING "" FORCE) # Skip install rule generation inside gRPC's dependency graph. This avoids # configure-time checks that require every transitive dependency (like Abseil diff --git a/vcpkg.json b/vcpkg.json index a5a2abc3..d4f7d156 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -5,13 +5,6 @@ "description": "Yet Another Zelda3 Editor", "builtin-baseline": "01f602195983451bc83e72f4214af2cbc495aa94", "dependencies": [ - { - "name": "yaml-cpp", - "platform": "windows" - }, - { - "name": "zlib", - "platform": "windows" - } + ] }