Default to make -j1 if nproc doesn’t exist
This commit is contained in:
+6
-6
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user