mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default to make -j1 if nproc doesn’t exist

Browse Source
This commit is contained in:
louiz’
2016-10-28 18:55:10 +02:00
parent ac61450184
commit 8c5c217a9e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+6 -6
View File
@@ -24,8 +24,8 @@ variables:
script: script:
- "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${CARES} ${SYSTEMD} ${LIBIDN} ${LITESQL}" - "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} - 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 -j$(nproc) - make check -j$(nproc || 1)
tags: tags:
- docker - docker
@@ -77,7 +77,7 @@ build:rpm:
- docker - docker
script: script:
- cmake .. -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 rpm -j$(nproc) - make rpm -j$(nproc || 1)
artifacts: artifacts:
paths: paths:
- build/rpmbuild/RPMS - build/rpmbuild/RPMS
@@ -90,10 +90,10 @@ build:rpm:
stage: test stage: test
script: script:
- cmake .. -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 biboumi -j$(nproc || 1)
- make check - make check
- make coverage - 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: artifacts:
paths: paths:
- build/coverage/ - build/coverage/
@@ -133,6 +133,6 @@ test:coverity:
script: script:
- export PATH=$PATH:~/coverity/bin - export PATH=$PATH:~/coverity/bin
- cmake .. -DWITHOUT_SYSTEMD=1 - 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 - 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 - 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