diff options
| author | Krzysztof Bogacki <krzysztof.bogacki@leancode.pl> | 2022-02-06 22:13:34 +0300 |
|---|---|---|
| committer | Philip Rebohle <25567304+doitsujin@users.noreply.github.com> | 2022-02-09 15:29:24 +0300 |
| commit | 4f3bb3df12ebed50435df554218d98362065ea79 (patch) | |
| tree | 2e42eae7f1bd01881cb8f5d8a63012b2c447f8e4 /.github | |
| parent | 6c862b63a2153ed650fcdb10386dd80cdd6ab4c8 (diff) | |
[build] Use MSBuild backend on Windows CI
Also merge Prepare and Build steps to prevent environment variable leaks and apply some minor formatting changes.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/test-build-windows.yml | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/.github/workflows/test-build-windows.yml b/.github/workflows/test-build-windows.yml index 029ddeda..67c3bfd6 100644 --- a/.github/workflows/test-build-windows.yml +++ b/.github/workflows/test-build-windows.yml @@ -19,9 +19,10 @@ jobs: choco install vulkan-sdk -y Write-Output "$([System.Environment]::GetEnvironmentVariable('VULKAN_SDK', 'Machine'))\Bin" ` | Out-File -FilePath "${Env:GITHUB_PATH}" -Append - - name: Setup Meson and Ninja + + - name: Setup Meson shell: pwsh - run: pip install meson ninja + run: pip install meson - name: Find Visual Studio shell: pwsh @@ -31,23 +32,21 @@ jobs: | Select-Object -ExpandProperty InstallationPath Write-Output "VSDEVCMD=${installationPath}\Common7\Tools\VsDevCmd.bat" ` | Out-File -FilePath "${Env:GITHUB_ENV}" -Append - - name: Prepare MSVC x86 - shell: pwsh - run: | - & "${Env:COMSPEC}" /s /c "`"${Env:VSDEVCMD}`" -arch=x86 -host_arch=x64 -no_logo && set" ` - | Out-File -FilePath "${Env:GITHUB_ENV}" -Append + - name: Build MSVC x86 shell: pwsh run: | - meson --buildtype release build-msvc-x86 - ninja -C build-msvc-x86 - - name: Prepare MSVC x64 - shell: pwsh - run: | - & "${Env:COMSPEC}" /s /c "`"${Env:VSDEVCMD}`" -arch=x64 -host_arch=x64 -no_logo && set" ` - | Out-File -FilePath "${Env:GITHUB_ENV}" -Append + & "${Env:COMSPEC}" /s /c "`"${Env:VSDEVCMD}`" -arch=x86 -host_arch=x64 -no_logo && set" ` + | % { , ($_ -Split '=', 2) } ` + | % { [System.Environment]::SetEnvironmentVariable($_[0], $_[1]) } + meson --buildtype release --backend vs2022 build-msvc-x86 + msbuild -m build-msvc-x86/dxvk.sln + - name: Build MSVC x64 shell: pwsh run: | - meson --buildtype release build-msvc-x64 - ninja -C build-msvc-x64 + & "${Env:COMSPEC}" /s /c "`"${Env:VSDEVCMD}`" -arch=x64 -host_arch=x64 -no_logo && set" ` + | % { , ($_ -Split '=', 2) } ` + | % { [System.Environment]::SetEnvironmentVariable($_[0], $_[1]) } + meson --buildtype release --backend vs2022 build-msvc-x64 + msbuild -m build-msvc-x64/dxvk.sln |