OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Re-enable Windows builds

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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

2
.gitlab-ci/build/gitlab-ci.yml
View File

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

2
.gitlab-ci/container/gitlab-ci.yml
View File

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

4
.gitlab-ci/image-tags.yml
View File

@@ -15,7 +15,7 @@ variables:
KERNEL_ROOTFS_TAG: "2022-05-31-cts-1.3.2.0" KERNEL_ROOTFS_TAG: "2022-05-31-cts-1.3.2.0"
WINDOWS_X64_BUILD_PATH: "windows/x64_build" 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_PATH: "windows/x64_test"
WINDOWS_X64_TEST_TAG: "2022-04-13-dozen_ci" WINDOWS_X64_TEST_TAG: "2022-27-05-server_2022"

2
.gitlab-ci/windows/Dockerfile_build
View File

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