osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GitLab CI: Switch to our new Windows runner.

This commit is contained in:
Gerald Combs 2021-04-04 13:28:16 -07:00 committed by Wireshark GitLab Utility
parent 56c540159d
commit 85b36ef4b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -341,7 +341,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 wireshark-windows-dev image is only available via a dedicated runner.
@ -356,7 +356,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] } }