xserver: Branch 'master' - 2 commits

[Adam Jackson]

 .gitlab-ci.yml      |   13 +++++++++++++
 include/meson.build |    6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 4191b59bd5458ea3a8b0d5272bdcd250fee1e129
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed May 2 15:09:52 2018 -0400

    meson: Fix build with three-component version numbers
    
    Otherwise:
    
    include/meson.build:5:0: ERROR: Index 3 out of bounds of array of size 3.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/include/meson.build b/include/meson.build
index 06affc327..691e9f074 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -2,7 +2,11 @@ version_split = meson.project_version().split('.')
 major = version_split[0].to_int()
 minor = version_split[1].to_int()
 patch = version_split[2].to_int()
-subpatch = version_split[3].to_int()
+if version_split.length() == 4
+    subpatch = version_split[3].to_int()
+else
+    subpatch = 0
+endif
 
 release = major * 10000000 + minor * 100000 + patch * 1000 + subpatch
 
commit 531e1648fc0da03816ecc57481479e6fc6a45ac3
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 25 13:39:18 2018 -0400

    gitlab-ci: Add for gitlab.freedesktop.org
    
    Looks quite a bit like the travis path, doesn't it? Still, nice to not
    rely on an external service if we don't have to.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..d66bb0b62
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+image: docker:latest
+services:
+    - docker:dind
+
+before_script:
+    - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
+    - echo ADD . /root >> Dockerfile
+    - echo WORKDIR /root >> Dockerfile
+    - docker build -t withgit .
+
+job:
+    script:
+        - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/scripts/build-travis-deps.sh