From ccf701b34f146cb9d45b1173124cc3b4da8c7817 Mon Sep 17 00:00:00 2001 From: joseph calderon Date: Tue, 7 Jul 2026 16:20:01 -0700 Subject: [PATCH] fix ci builds by pinning msvc to windows-2022 and configuring waf on linux --- .github/workflows/cmake.yml | 8 ++++---- src/dotnet/pack-linux-x64.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 223cc4e..7d205f6 100755 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -17,15 +17,15 @@ jobs: matrix: config: - { - name: "Windows Latest MSVC Shared", artifact: "Windows-MSVC-shared.tar.xz", - os: windows-latest, + name: "Windows 2022 MSVC Shared", artifact: "Windows-MSVC-shared.tar.xz", + os: windows-2022, cc: "cl", cxx: "cl", shared: "ON", environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" } - { - name: "Windows Latest MSVC", artifact: "Windows-MSVC.tar.xz", - os: windows-latest, + name: "Windows 2022 MSVC", artifact: "Windows-MSVC.tar.xz", + os: windows-2022, cc: "cl", cxx: "cl", shared: "OFF", environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" diff --git a/src/dotnet/pack-linux-x64.sh b/src/dotnet/pack-linux-x64.sh index 3a81a2c..444f22d 100644 --- a/src/dotnet/pack-linux-x64.sh +++ b/src/dotnet/pack-linux-x64.sh @@ -1,6 +1,7 @@ #!/bin/bash currenPath="$PWD" cd ../../ +./waf configure ./waf cd "$currenPath" libPath="$currenPath/lib"