From: Eric Engestrom <eric.engestrom@intel.com>
Date: Fri, 8 Mar 2019 12:47:23 +0000 (+0000)
Subject: gitlab-ci: add scons windows build using mingw
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c15a87aeab64692cdce7abf471c30869145f449;p=mesa.git

gitlab-ci: add scons windows build using mingw

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f336cbb0b9a..7878435130b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@
 # at "01" unless you have multiple updates on the same day :)
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-04-16"
+  DEBIAN_TAG: "2019-05-01"
   DEBIAN_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
@@ -327,3 +327,9 @@ scons-swr:
     SCONS_TARGET: "swr=1"
     SCONS_CHECK_COMMAND: "true"
     LLVM_VERSION: "6.0"
+
+scons-win64:
+  extends: .scons-build
+  variables:
+    SCONS_TARGET: platform=windows machine=x86_64
+    SCONS_CHECK_COMMAND: "true"
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 8bbd451e422..3b8a1c0c5d5 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -68,6 +68,11 @@ apt-get install -y \
       gettext \
       make
 
+# for 64bit windows cross-builds
+apt-get install -y \
+      wine64 \
+      mingw-w64
+
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
 export               XCB_RELEASES=https://xcb.freedesktop.org/dist