From 9527611da8ed9ddbfac49edbb2f8a1ce0a1a78f0 Mon Sep 17 00:00:00 2001 From: Marcel Otte Date: Mon, 18 Apr 2016 20:32:37 +0200 Subject: [PATCH] changed docker image use to buildspecific instead of gloabl --- .gitignore | 1 + .gitlab-ci.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4d6556c..908c0d9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.war *.ear /bin +*/.settings/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb642de..b26049e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ -image: archlinux_gcc5.3_qt5 stages: - build build-c: + image: archlinux_gcc5.3_qt5 stage: build script: - cd c; make @@ -12,6 +12,7 @@ build-c: - c/tests-* build-cpp: + image: archlinux_gcc5.3_qt5 stage: build script: - cd cpp; mkdir build; cd build