forked from osmocom/wireshark
GitLab CI: Switch to our new Windows runner.
(cherry picked from commit 85b36ef4b6
)
This commit is contained in:
parent
f1677bd31c
commit
1be17e2d30
|
@ -268,7 +268,7 @@ merge-req:ubuntu-clang-other-tests:
|
|||
# find a more independent way of installing Qt, e.g. via a download+cache.
|
||||
merge-req:windows:
|
||||
tags:
|
||||
- wireshark-windows-dev
|
||||
- wireshark-windows-merge-req
|
||||
stage: build
|
||||
rules:
|
||||
# The Windows Docker image is currently only available via a dedicated runner.
|
||||
|
@ -280,7 +280,7 @@ merge-req:windows:
|
|||
- $env:Configuration = "RelWithDebInfo"
|
||||
- $env:Path += ";C:\Program Files\CMake\bin"
|
||||
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
|
||||
- $env:Path += ";C:\qt\5.15.1\msvc2019_64\bin"
|
||||
- $env:Path += ";C:\qt\5.15.2\msvc2019_64\bin"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
|
|
Loading…
Reference in New Issue