summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-10-31 14:09:20 +0100
committerlouiz’ <louiz@louiz.org>2016-10-31 14:09:20 +0100
commit835999d5f54280727bef7b6c853dd77f839681b6 (patch)
treecc0bb68ed7bf9389bc0f37cca5d77d59356bd596
parentae02e58b9dc276b247be84e1d708ca50a1f5bbd0 (diff)
downloadbiboumi-835999d5f54280727bef7b6c853dd77f839681b6.tar.gz
biboumi-835999d5f54280727bef7b6c853dd77f839681b6.tar.bz2
biboumi-835999d5f54280727bef7b6c853dd77f839681b6.tar.xz
biboumi-835999d5f54280727bef7b6c853dd77f839681b6.zip
ci: Fix the nproc thingy
-rw-r--r--.gitlab-ci.yml14
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbdef05..b700cd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,14 +18,15 @@ variables:
SYSTEMD: "-DWITH_SYSTEMD=1"
LIBIDN: "-DWITH_LIBIDN=1"
LITESQL: "-DWITH_LITESQL=1"
+ NPROC: "$(nproc)"
.template:basic_build: &basic_build
stage: build
script:
- "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}"
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- - make biboumi -j$(nproc || echo 1)
- - make check -j$(nproc || echo 1)
+ - make biboumi -j${NPROC}
+ - make check -j${NPROC}
tags:
- docker
@@ -77,7 +78,7 @@ build:rpm:
- docker
script:
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- - make rpm -j$(nproc || echo 1)
+ - make rpm -j${NPROC}
artifacts:
paths:
- build/rpmbuild/RPMS
@@ -90,10 +91,10 @@ build:rpm:
stage: test
script:
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- - make biboumi -j$(nproc || echo 1)
+ - make biboumi -j${NPROC}
- make check
- make coverage
- - mkdir tests_outputs && pushd tests_outputs && make coverage_e2e -j$(nproc || echo 1) -C .. && popd
+ - mkdir tests_outputs && pushd tests_outputs && make coverage_e2e -j${NPROC} -C .. && popd
artifacts:
paths:
- build/coverage/
@@ -120,6 +121,7 @@ test:openbsd:
variables:
COMPILER: "g++"
SYSTEMD: "-DWITHOUT_SYSTEMD=1"
+ NPROC: 1
stage: test
tags:
- openbsd
@@ -133,6 +135,6 @@ test:coverity:
script:
- export PATH=$PATH:~/coverity/bin
- cmake .. -DWITHOUT_SYSTEMD=1
- - cov-build --dir cov-int make biboumi test_suite -j$(nproc || echo 1)
+ - cov-build --dir cov-int make biboumi test_suite -j${NPROC}
- tar czvf biboumi_coverity.tgz cov-int
- curl --form token=$COVERITY_TOKEN --form email=louiz@louiz.org --form file=@biboumi_coverity.tgz --form version="$(git rev-parse --short HEAD)" --form description="Automatic submission by gitlab-ci" https://scan.coverity.com/builds?project=louiz%2Fbiboumi