mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Allow the Windows base and main image to have different tags

Browse source
This commit is contained in:
Ryan Pavlik 2022-05-20 15:16:19 -05:00 committed by Jakob Bornecrantz
parent dacdcf8375
commit 355fb036b5
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci.yml
View file

@ -200,7 +200,8 @@ arch:rolling:container_prep:
inherit: inherit:
default: false default: false
variables: variables:
FDO_DISTRIBUTION_TAG: "20220518.0" MONADO_WIN_BASE_TAG: "20220518.0"
MONADO_WIN_MAIN_TAG: "20220518.0"
MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2019/vs2022" MONADO_MAIN_IMAGE_PATH: "win2019/vs2022"
@ -211,6 +212,7 @@ arch:rolling:container_prep:
- .monado.common_variables.windows:vs2022 - .monado.common_variables.windows:vs2022
variables: variables:
MONADO_IMAGE_PATH: "$MONADO_MAIN_IMAGE_PATH" MONADO_IMAGE_PATH: "$MONADO_MAIN_IMAGE_PATH"
FDO_DISTRIBUTION_TAG: "$MONADO_WIN_MAIN_TAG"
MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
@ -241,6 +243,7 @@ win:container_prep:base:
variables: variables:
DOCKERFILE: Dockerfile.vs2022 DOCKERFILE: Dockerfile.vs2022
MONADO_IMAGE_PATH: ${MONADO_BASE_IMAGE_PATH} MONADO_IMAGE_PATH: ${MONADO_BASE_IMAGE_PATH}
FDO_DISTRIBUTION_TAG: "$MONADO_WIN_BASE_TAG"
MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
@ -253,8 +256,8 @@ win:container_prep:
- win:container_prep:base - win:container_prep:base
variables: variables:
DOCKERFILE: Dockerfile.build DOCKERFILE: Dockerfile.build
MONADO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_BASE_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_BASE_IMAGE_PATH:$MONADO_WIN_BASE_TAG"
MONADO_UPSTREAM_BASE_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_BASE_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_UPSTREAM_BASE_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_BASE_IMAGE_PATH:$MONADO_WIN_BASE_TAG"
# Base job to use a Windows build container # Base job to use a Windows build container
.monado.image.windows: .monado.image.windows:

9
.gitlab-ci/win_containers.yml
View file

@ -9,7 +9,8 @@
inherit: inherit:
default: false default: false
variables: variables:
FDO_DISTRIBUTION_TAG: "20220518.0" MONADO_WIN_BASE_TAG: "20220518.0"
MONADO_WIN_MAIN_TAG: "20220518.0"
MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base" MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base"
MONADO_MAIN_IMAGE_PATH: "win2019/vs2022" MONADO_MAIN_IMAGE_PATH: "win2019/vs2022"
@ -20,6 +21,7 @@
- .monado.common_variables.windows:vs2022 - .monado.common_variables.windows:vs2022
variables: variables:
MONADO_IMAGE_PATH: "$MONADO_MAIN_IMAGE_PATH" MONADO_IMAGE_PATH: "$MONADO_MAIN_IMAGE_PATH"
FDO_DISTRIBUTION_TAG: "$MONADO_WIN_MAIN_TAG"
MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
@ -50,6 +52,7 @@ win:container_prep:base:
variables: variables:
DOCKERFILE: Dockerfile.vs2022 DOCKERFILE: Dockerfile.vs2022
MONADO_IMAGE_PATH: ${MONADO_BASE_IMAGE_PATH} MONADO_IMAGE_PATH: ${MONADO_BASE_IMAGE_PATH}
FDO_DISTRIBUTION_TAG: "$MONADO_WIN_BASE_TAG"
MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_IMAGE_PATH:$FDO_DISTRIBUTION_TAG"
@ -62,8 +65,8 @@ win:container_prep:
- win:container_prep:base - win:container_prep:base
variables: variables:
DOCKERFILE: Dockerfile.build DOCKERFILE: Dockerfile.build
MONADO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_BASE_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/$MONADO_BASE_IMAGE_PATH:$MONADO_WIN_BASE_TAG"
MONADO_UPSTREAM_BASE_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_BASE_IMAGE_PATH:$FDO_DISTRIBUTION_TAG" MONADO_UPSTREAM_BASE_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MONADO_BASE_IMAGE_PATH:$MONADO_WIN_BASE_TAG"
# Base job to use a Windows build container # Base job to use a Windows build container
.monado.image.windows: .monado.image.windows: