aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2019-01-21 17:13:59 +0100
committerToni Uhlig <matzeton@googlemail.com>2019-01-21 17:13:59 +0100
commit3408232b6cbb8b2ae5fc5ad8b9a3648b3b4391c2 (patch)
tree4de2c03d7eba6e1a50a5a4044a27d942e381c244
parent25ec6db0d446c406802f143c414d2a3bfbc94204 (diff)
added gitlab-ci support
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r--.gitlab-ci.yml13
-rw-r--r--.travis.yml2
2 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..56cbf98
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+image: debian:stable-slim
+
+stages:
+ - build
+
+build:
+ script:
+ - apt-get -qq update
+ - apt-get install -y make binutils nasm gcc libc6-dev libc6-dev-i386
+ - make -j4 V=s
+ stage: build
+ only:
+ - master
diff --git a/.travis.yml b/.travis.yml
index 7eca778..23c8bad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: c asm
before_install:
- sudo apt-get -qq update
-- sudo apt-get install make binutils nasm gcc libc6-dev libc6-dev-i386
+- sudo apt-get install -y make binutils nasm gcc libc6-dev libc6-dev-i386
script:
- make