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

Revert the whole nproc thing

Browse Source
This commit is contained in:
louiz’
2016-10-31 15:20:12 +01:00
parent bf8348186b
commit 03cdf75757
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+6 -8
View File
@@ -18,15 +18,14 @@ variables:
SYSTEMD: "-DWITH_SYSTEMD=1" SYSTEMD: "-DWITH_SYSTEMD=1"
LIBIDN: "-DWITH_LIBIDN=1" LIBIDN: "-DWITH_LIBIDN=1"
LITESQL: "-DWITH_LITESQL=1" LITESQL: "-DWITH_LITESQL=1"
NPROC: "$(nproc)"
.template:basic_build: &basic_build .template:basic_build: &basic_build
stage: build stage: build
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 || echo 1)
- make check -j${NPROC} - make check -j$(nproc || echo 1)
tags: tags:
- docker - docker
@@ -78,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 || echo 1)
artifacts: artifacts:
paths: paths:
- build/rpmbuild/RPMS - build/rpmbuild/RPMS
@@ -91,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 || echo 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 || echo 1) -C .. && popd
artifacts: artifacts:
paths: paths:
- build/coverage/ - build/coverage/
@@ -121,7 +120,6 @@ test:openbsd:
variables: variables:
COMPILER: "g++" COMPILER: "g++"
SYSTEMD: "-DWITHOUT_SYSTEMD=1" SYSTEMD: "-DWITHOUT_SYSTEMD=1"
NPROC: "1"
stage: test stage: test
tags: tags:
- openbsd - openbsd
@@ -135,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 || echo 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