summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-10-24 11:33:06 +0200
committerlouiz’ <louiz@louiz.org>2016-10-24 11:39:28 +0200
commitb141f3ddeeb4d3cb66eca0a919595c3c661af2b5 (patch)
treedd3f4bce5ade2b23bc359112926f65eace844b95
parent4359680f9df92475c439f16a163bf5a9b37813b3 (diff)
downloadbiboumi-b141f3ddeeb4d3cb66eca0a919595c3c661af2b5.tar.gz
biboumi-b141f3ddeeb4d3cb66eca0a919595c3c661af2b5.tar.bz2
biboumi-b141f3ddeeb4d3cb66eca0a919595c3c661af2b5.tar.xz
biboumi-b141f3ddeeb4d3cb66eca0a919595c3c661af2b5.zip
Explicitely use the docker runner on some builds
-rw-r--r--.gitlab-ci.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29124eb..b975134 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,8 @@ variables:
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- make biboumi -j$(nproc)
- make check -j$(nproc)
+ tags:
+ - docker
image: biboumi-test-fedora:latest
@@ -70,6 +72,9 @@ build:6:
build:rpm:
stage: build
+ image: biboumi-test-fedora:latest
+ tags:
+ - docker
script:
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- make rpm -j$(nproc)
@@ -100,11 +105,15 @@ build:rpm:
test:debian:
stage: test
image: biboumi-test-debian:latest
+ tags:
+ - docker
<<: *basic_test
test:fedora:
stage: test
image: biboumi-test-fedora:latest
+ tags:
+ - docker
<<: *basic_test
test:openbsd: