From 80eafc2bda6ce0b9a4d3f7e8486d7d90c62f8ba6 Mon Sep 17 00:00:00 2001 From: mario4tier Date: Wed, 20 Nov 2024 17:21:46 -0500 Subject: [PATCH] Another attempt at VCVARSALL fix --- .github/workflows/dev-nightly-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-nightly-tests.yml b/.github/workflows/dev-nightly-tests.yml index eac3c8dd..969b2672 100644 --- a/.github/workflows/dev-nightly-tests.yml +++ b/.github/workflows/dev-nightly-tests.yml @@ -53,7 +53,8 @@ jobs: run: | call "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe > msbuild_path.txt set /p MSBUILD_PATH=> %GITHUB_ENV% + set VCVARSALL=%MSBUILD_PATH%\..\..\..\..\VC\Auxiliary\Build\vcvarsall.bat + echo VCVARSALL=%VCVARSALL% >> %GITHUB_ENV% echo PYTHON=python >> %GITHUB_ENV% - name: Build dist assets (Linux) @@ -70,7 +71,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: cmd run: | - call %VCVARSALL% x64 + call "%VCVARSALL%" x64 %PYTHON% %GITHUB_WORKSPACE%\scripts\package.py - name: Test dist assets (Linux) @@ -86,5 +87,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: cmd run: | - call %VCVARSALL% x64 + call "%VCVARSALL%" x64 %PYTHON% %GITHUB_WORKSPACE%\scripts\test-dist.py