From 3a934735e6c978a45ddc77120b9aec88d8fec5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 21 Jan 2016 20:47:33 +0100
Subject: [PATCH] New file .gitlab-ci.yml.

---
 .gitlab-ci.yml | 19 +++++++++++++++++++
 ChangeLog      |  5 +++++
 2 files changed, 24 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..99b241e6
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,19 @@
+# See http://doc.gitlab.com/ce/ci/yaml/ for documentation.
+Build and Check (x86-64):
+  script:
+  - ./.bootstrap &&
+    ./configure --disable-documentation && make -j4 &&
+    make check -j4
+  tags:
+  - x86-64
+  except:
+  - tags
+Build and Check (x86):
+  script:
+  - ./.bootstrap &&
+    ./configure --disable-documentation && make -j4 &&
+    make check -j4
+  tags:
+  - x86
+  except:
+  - tags
diff --git a/ChangeLog b/ChangeLog
index c8f31926..74d875b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-21  Niels Möller  <nisse@lysator.liu.se>
+
+	* .gitlab-ci.yml: New file. Configuration for gitlab's continuous
+	integration system.
+
 2016-01-20  Niels Möller  <nisse@lysator.liu.se>
 
 	* testsuite/dlopen-test.c (main): Mark arguments as UNUSED.
-- 
GitLab