summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-10-31 15:06:44 +0100
committerlouiz’ <louiz@louiz.org>2016-10-31 15:20:12 +0100
commit03cdf75757db9d1d49631cd218941f3e80613a79 (patch)
treeef20d9624c010829a3187db179409662c1be72a0
parentbf8348186bde589733de34e6bf988f85fefef444 (diff)
downloadbiboumi-03cdf75757db9d1d49631cd218941f3e80613a79.tar.gz
biboumi-03cdf75757db9d1d49631cd218941f3e80613a79.tar.bz2
biboumi-03cdf75757db9d1d49631cd218941f3e80613a79.tar.xz
biboumi-03cdf75757db9d1d49631cd218941f3e80613a79.zip
Revert the whole nproc thing
-rw-r--r--.gitlab-ci.yml14
1 files changed, 6 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ecc65a..bbdef05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,15 +18,14 @@ 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}
- - make check -j${NPROC}
+ - make biboumi -j$(nproc || echo 1)
+ - make check -j$(nproc || echo 1)
tags:
- docker
@@ -78,7 +77,7 @@ build:rpm:
- docker
script:
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- - make rpm -j${NPROC}
+ - make rpm -j$(nproc || echo 1)
artifacts:
paths:
- build/rpmbuild/RPMS
@@ -91,10 +90,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}
+ - make biboumi -j$(nproc || echo 1)
- make check
- make coverage
- - mkdir tests_outputs && pushd tests_outputs && make coverage_e2e -j${NPROC} -C .. && popd
+ - mkdir tests_outputs && pushd tests_outputs && make coverage_e2e -j$(nproc || echo 1) -C .. && popd
artifacts:
paths:
- build/coverage/
@@ -121,7 +120,6 @@ test:openbsd:
variables:
COMPILER: "g++"
SYSTEMD: "-DWITHOUT_SYSTEMD=1"
- NPROC: "1"
stage: test
tags:
- openbsd
@@ -135,6 +133,6 @@ test:coverity:
script:
- export PATH=$PATH:~/coverity/bin
- cmake .. -DWITHOUT_SYSTEMD=1
- - cov-build --dir cov-int make biboumi test_suite -j${NPROC}
+ - cov-build --dir cov-int make biboumi test_suite -j$(nproc || echo 1)
- 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