BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ci builds by pinning msvc to windows-2022 and configuring waf on linux (#103)

master
Joe Calderon 2026-07-08 06:29:06 -07:00 committed by GitHub
parent 75a3dd59ee
commit 1686404314
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/cmake.yml vendored
View File

@ -17,15 +17,15 @@ jobs:
matrix: matrix:
config: config:
- { - {
name: "Windows Latest MSVC Shared", artifact: "Windows-MSVC-shared.tar.xz", name: "Windows 2022 MSVC Shared", artifact: "Windows-MSVC-shared.tar.xz",
os: windows-latest, os: windows-2022,
cc: "cl", cxx: "cl", cc: "cl", cxx: "cl",
shared: "ON", shared: "ON",
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
} }
- { - {
name: "Windows Latest MSVC", artifact: "Windows-MSVC.tar.xz", name: "Windows 2022 MSVC", artifact: "Windows-MSVC.tar.xz",
os: windows-latest, os: windows-2022,
cc: "cl", cxx: "cl", cc: "cl", cxx: "cl",
shared: "OFF", shared: "OFF",
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"

1
src/dotnet/pack-linux-x64.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
currenPath="$PWD" currenPath="$PWD"
cd ../../ cd ../../
./waf configure
./waf ./waf
cd "$currenPath" cd "$currenPath"
libPath="$currenPath/lib" libPath="$currenPath/lib"