summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-10-28 18:55:10 +0200
committerlouiz’ <louiz@louiz.org>2016-10-28 18:55:10 +0200
commit8c5c217a9e807281632c9feeb6487ace959ab0a8 (patch)
treebea5d994173b92be6db1419a04d7f2593cae7563
parentac61450184112ccb22971cff6cfa6117b4ddfbb6 (diff)
downloadbiboumi-8c5c217a9e807281632c9feeb6487ace959ab0a8.tar.gz
biboumi-8c5c217a9e807281632c9feeb6487ace959ab0a8.tar.bz2
biboumi-8c5c217a9e807281632c9feeb6487ace959ab0a8.tar.xz
biboumi-8c5c217a9e807281632c9feeb6487ace959ab0a8.zip
Default to make -j1 if nproc doesn’t exist
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b975134..08cb686 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,8 @@ variables:
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 || 1)
+ - make check -j$(nproc || 1)
tags:
- docker
@@ -77,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 || 1)
artifacts:
paths:
- build/rpmbuild/RPMS
@@ -90,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 || 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 || 1) -C .. && popd
artifacts:
paths:
- build/coverage/
@@ -133,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 || 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