Skip to content

Commit

Permalink
try install-deps in vcvarsall environment
Browse files Browse the repository at this point in the history
  • Loading branch information
NQNStudios committed Jan 12, 2025
1 parent 27f5a74 commit 4750f64
Showing 3 changed files with 9 additions and 14 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -143,14 +143,10 @@
with: { submodules: true }
},
{
name: install build dependencies,
run: 'pip install scons'
},
# {
# name: install dependencies,
# run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x64',
# working-directory: proj/vs2017
#},
name: install dependencies,
run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x64',
working-directory: proj/vs2017
},
{
name: build and unit test,
run: '.\.github\workflows\scripts\win\scons-build.bat test=true'
5 changes: 5 additions & 0 deletions .github/workflows/scripts/win/install-deps.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64

REM Install build dependencies
pip install scons
vcpkg install libxml2
REM Install dependencies
vcpkg install --feature-flags=manifests,binarycaching --triplet %1-windows
6 changes: 0 additions & 6 deletions .github/workflows/scripts/win/scons-build.bat
Original file line number Diff line number Diff line change
@@ -10,12 +10,6 @@ REM @echo "%%i"
REM call "%%i" x86_amd64
REM )

type "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64

@echo on
echo %CC%
echo %CXX%
@echo off

scons bits=64 %*

0 comments on commit 4750f64

Please sign in to comment.