mirror of
https://git.sr.ht/~lattis/muon
synced 2026-01-26 08:07:51 +00:00
remove usage of msvc-dev-cmd in github actions
This commit is contained in:
parent
2809eda795
commit
dfa07b57ea
6
.github/workflows/vs2019.yml
vendored
6
.github/workflows/vs2019.yml
vendored
@ -17,10 +17,9 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
arch:
|
||||
- x86
|
||||
- amd64
|
||||
- amd64_x86
|
||||
compiler:
|
||||
# TODO: Add clang when bootstrap.bat adds clang support.
|
||||
- msvc
|
||||
name: ${{ matrix.arch }} - ${{ matrix.compiler }}
|
||||
runs-on: windows-2019
|
||||
@ -29,9 +28,6 @@ jobs:
|
||||
shell: cmd
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ilammy/msvc-dev-cmd@v1
|
||||
with:
|
||||
arch: ${{ matrix.arch }}
|
||||
- name: bootstrap
|
||||
run: >
|
||||
bootstrap.bat build
|
||||
|
||||
@ -10,11 +10,13 @@ if "%~1" == "" goto :usage
|
||||
where cl >nul 2>nul
|
||||
if %ERRORLEVEL%==0 goto :build
|
||||
|
||||
if "%~2" == "" (set arch=amd64) else (set arch=%~2)
|
||||
|
||||
:: Attempt to run vcvarsall if cl was not found.
|
||||
for /f "tokens=*" %%g in (
|
||||
'"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath'
|
||||
) do (set installation_path=%%g)
|
||||
call "%installation_path%\VC\Auxiliary\Build\vcvarsall" x64
|
||||
call "%installation_path%\VC\Auxiliary\Build\vcvarsall" %arch%
|
||||
|
||||
:build
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user