KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Use MESA_ namespace for image variables in Windows jobs 

Instead of a separate WINDOWS_ namespace.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7988>
This commit is contained in:
Michel Dänzer 2020-12-09 18:42:15 +01:00 committed by Marge Bot
parent 26d2ffeb20
commit ab7e1dff0b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -446,9 +446,9 @@ armhf_test:
.windows-docker-vs2019:
variables:
WINDOWS_TAG: "2021-01-29"
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:${WINDOWS_TAG}--${MESA_TEMPLATES_COMMIT}"
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:${WINDOWS_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_IMAGE_TAG: "2021-01-29"
MESA_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
windows_build_vs2019:
extends:
@ -464,11 +464,11 @@ windows_build_vs2019:
- "1809"
- mesa
script:
- .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $WINDOWS_IMAGE $WINDOWS_UPSTREAM_IMAGE
- .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE
.use-windows_build_vs2019:
extends: .windows-docker-vs2019
image: "$WINDOWS_IMAGE"
image: "$MESA_IMAGE"
needs:
- windows_build_vs2019