CI: Re-enable Windows builds

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16756>
This commit is contained in:
Jesse Natalie 2022-05-27 09:24:33 -07:00 committed by Marge Bot
parent cb2cc69ebb
commit 7f81333f71
5 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@ variables:
# running on a particular CI farm (ie. for outages, etc):
FD_FARM: "online"
COLLABORA_FARM: "online"
MICROSOFT_FARM: "offline"
MICROSOFT_FARM: "online"
LIMA_FARM: "online"
default:

View File

@ -37,7 +37,7 @@
tags:
- windows
- docker
- "1809"
- "2022"
- mesa
cache:
key: ${CI_JOB_NAME}

View File

@ -361,7 +361,7 @@ debian/arm_test:
tags:
- windows
- shell
- "1809"
- "2022"
- mesa
script:
- .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}

View File

@ -15,7 +15,7 @@ variables:
KERNEL_ROOTFS_TAG: "2022-05-31-cts-1.3.2.0"
WINDOWS_X64_BUILD_PATH: "windows/x64_build"
WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"
WINDOWS_X64_BUILD_TAG: "2022-27-05-server_2022"
WINDOWS_X64_TEST_PATH: "windows/x64_test"
WINDOWS_X64_TEST_TAG: "2022-04-13-dozen_ci"
WINDOWS_X64_TEST_TAG: "2022-27-05-server_2022"

View File

@ -1,6 +1,6 @@
# escape=`
FROM mcr.microsoft.com/windows:1809
FROM mcr.microsoft.com/windows/server:ltsc2022
# Make sure any failure in PowerShell scripts is fatal
SHELL ["powershell", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]