Skip to content

Commit

Permalink
temporarily reorder CI steps
Browse files Browse the repository at this point in the history
  • Loading branch information
NQNStudios committed May 29, 2024
1 parent 39b4ce0 commit 78b2ddd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: build and unit test,
run: '.\.github\workflows\scripts\win\scons-build.bat'
},
{
name: install build dependencies,
run: 'vcpkg install libxml2 && pip install scons'
Expand All @@ -120,10 +124,6 @@
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'
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/win/scons-build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
setlocal enabledelayedexpansion

for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -find **/Auxiliary/Build/vcvarsall.bat`) do (
call %%i x86_amd64
call "%%i x86_amd64"
)

scons

0 comments on commit 78b2ddd

Please sign in to comment.