New file .gitlab-ci.yml.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644 (file)
index 0000000..99b241e
--- /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 c8f3192617444721f580945a1e1b7b287b9fd170..74d875b2e479508d66055773f86e76ae3eadd83d 100644 (file)
--- 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.