x86_test-vk:
extends: x86_build
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-23"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-27"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
- .fdo.container-ifnot-exists@debian@arm64v8
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_build "2020-03-17-db820c"
+ FDO_DISTRIBUTION_TAG: &arm_build "2020-03-24"
.use-arm_build:
variables:
- meson-arm64
- arm_test
+# Native Windows docker builds
+#
+# Unlike the above Linux-based builds - including MinGW/SCons builds which
+# cross-compile for Windows - which use the freedesktop ci-templates, we
+# cannot use the same scheme here. As Windows lacks support for
+# Docker-in-Docker, and Podman does not run natively on Windows, we have
+# to open-code much of the same ourselves.
+#
+# This is achieved by first running in a native Windows shell instance
+# (host PowerShell) in the container stage to build and push the image,
+# then in the build stage by executing inside Docker.
+
+.windows-docker-vs2019:
+ variables:
+ WINDOWS_TAG: "2020-03-24"
+ WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG"
+ WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG"
+
+windows_build_vs2019:
+ extends:
+ - .container
+ - .windows-docker-vs2019
+ stage: container
+ variables:
+ GIT_STRATEGY: fetch # we do actually need the full repository though
+ tags:
+ - windows
+ - shell
+ - "1809"
+ script:
+ - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $WINDOWS_IMAGE $WINDOWS_UPSTREAM_IMAGE
+
+.use-windows_build_vs2019:
+ extends: .windows-docker-vs2019
+ image: "$WINDOWS_IMAGE"
+ needs:
+ - windows_build_vs2019
# BUILD
.build-windows:
extends: .build-common
tags:
- - mesa-windows
+ - windows
+ - docker
+ - "1809"
cache:
key: ${CI_JOB_NAME}
paths:
CC: "ccache clang-9"
CXX: "ccache clang++-9"
-.meson-windows:
+meson-windows-vs2019:
extends:
- .build-windows
+ - .use-windows_build_vs2019
stage: meson-misc
- before_script:
- - $ENV:ARCH = "x86"
- - $ENV:VERSION = "2019\Community"
script:
- - cmd /C .gitlab-ci\meson-build.bat
+ - . .\.gitlab-ci\windows\mesa_build.ps1
scons-win64:
extends: .scons-build