Commit 5ce19734 authored by Michał Kępień's avatar Michał Kępień
Browse files

Merge branch 'michal/miscellaneous-windows-tweaks-v9_11' into 'v9_11'

[v9_11] Miscellaneous Windows tweaks

See merge request !4361
parents 840995bd 6dd6da17
Pipeline #56425 canceled with stages
in 228 minutes and 38 seconds
......@@ -81,6 +81,11 @@ stages:
- bsd-stress
- stress
.windows-amd64: &windows_amd64
tags:
- windows
- amd64
### Docker Image Templates
# Alpine Linux
......@@ -147,6 +152,12 @@ stages:
image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64"
<<: *linux_amd64
# Windows
.windows-server-2016-amd64: &windows_server_2016_amd64_image
image: "$CI_REGISTRY_IMAGE:windows-server-2016-amd64"
<<: *windows_amd64
# Base image
# This is a meta image that is used as a base for non-specific jobs
......@@ -237,9 +248,6 @@ stages:
.windows_build: &windows_build_job
stage: build
tags:
- windows
- amd64
script:
- 'Push-Location "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build"'
- '& cmd.exe /C "vcvarsall.bat x64 & set" | Foreach-Object { if ($_ -match "(.*?)=(.*)") { Set-Item -force -path "Env:\$($matches[1])" -value "$($matches[2])" } }'
......@@ -316,9 +324,6 @@ stages:
.windows_system_test: &windows_system_test_job
stage: system
tags:
- windows
- amd64
script:
- 'Push-Location bin/tests/system'
- '$ifIndex = Get-NetIPInterface -AddressFamily IPv4 -InterfaceMetric 75 | Select-Object -ExpandProperty ifIndex'
......@@ -1237,12 +1242,14 @@ unit:nolibtool:sid:amd64:
# Jobs for Visual Studio 2017 builds on Windows (amd64)
msvc:windows:amd64:
<<: *windows_server_2016_amd64_image
<<: *windows_build_job
<<: *default_triggering_rules
variables:
VSCONF: Release
system:msvc:windows:amd64:
<<: *windows_server_2016_amd64_image
<<: *windows_system_test_job
variables:
VSCONF: Release
......@@ -1251,6 +1258,7 @@ system:msvc:windows:amd64:
artifacts: true
msvc-debug:windows:amd64:
<<: *windows_server_2016_amd64_image
<<: *windows_build_job
variables:
VSCONF: Debug
......@@ -1260,6 +1268,7 @@ msvc-debug:windows:amd64:
- web
system:msvc-debug:windows:amd64:
<<: *windows_server_2016_amd64_image
<<: *windows_system_test_job
variables:
VSCONF: Debug
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment