summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml19
-rw-r--r--ChangeLog5
2 files changed, 24 insertions, 0 deletions
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.