From 10327c675267b09c68a692334e32c459b64ef75f Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Thu, 24 Oct 2024 01:26:09 +0200 Subject: [PATCH] ci: Renable parallalize build IT does not cause ci issues. There was a regression with the unit test. See: https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/400 --- .gitlab/pipeline/debian.yml | 8 ++++---- .gitlab/pipeline/fedora.yml | 4 ++-- .gitlab/pipeline/opensuse.yml | 2 +- docker/Dockerfile.debian | 2 +- docker/Dockerfile.windows | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab/pipeline/debian.yml b/.gitlab/pipeline/debian.yml index eb9e0568..117dee1d 100644 --- a/.gitlab/pipeline/debian.yml +++ b/.gitlab/pipeline/debian.yml @@ -8,7 +8,7 @@ debian_testing_gcc: - ./ci/debian/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ - - make + - make -j$(nproc) - ctest -VV parallel: matrix: @@ -24,7 +24,7 @@ debian_stable_gcc: - ./ci/debian/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ - - make + - make -j$(nproc) - ctest -VV parallel: matrix: @@ -40,7 +40,7 @@ debian_testing_clang: - ./ci/debian/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ - - make + - make -j$(nproc) - ctest -VV parallel: matrix: @@ -56,7 +56,7 @@ debian_stable_clang: - ./ci/debian/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ - - make + - make -j$(nproc) - ctest -VV parallel: matrix: diff --git a/.gitlab/pipeline/fedora.yml b/.gitlab/pipeline/fedora.yml index db94cc72..b3b0c4f4 100644 --- a/.gitlab/pipeline/fedora.yml +++ b/.gitlab/pipeline/fedora.yml @@ -8,7 +8,7 @@ fedora40_clang: - ./ci/fedora/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-$CGAL_VERSION - - make + - make -j$(nproc) - ctest -VV parallel: matrix: @@ -24,7 +24,7 @@ fedora40_gcc: - ./ci/fedora/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-$CGAL_VERSION - - make + - make -j$(nproc) - ctest -VV parallel: matrix: diff --git a/.gitlab/pipeline/opensuse.yml b/.gitlab/pipeline/opensuse.yml index dcdc861e..89dd78eb 100644 --- a/.gitlab/pipeline/opensuse.yml +++ b/.gitlab/pipeline/opensuse.yml @@ -5,5 +5,5 @@ opensuse_gcc: script: - ./ci/opensuse/before_install.sh - cmake -S . -B build -DSFCGAL_BUILD_TESTS=ON -GNinja - - cmake --build build + - cmake --build build -j$(nproc) - ctest --test-dir build --output-on-failure diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index f1d4de1f..d151f889 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -17,7 +17,7 @@ RUN CGAL_DIR=/CGAL cmake -B build \ -DCMAKE_C_COMPILER=/usr/bin/gcc \ -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ -DCMAKE_BUILD_TYPE=Release && \ - cmake --build build + cmake --build build -j$(nproc) FROM debian:stable-slim AS run diff --git a/docker/Dockerfile.windows b/docker/Dockerfile.windows index cea66bd6..757c3438 100644 --- a/docker/Dockerfile.windows +++ b/docker/Dockerfile.windows @@ -10,7 +10,7 @@ RUN cmake -S . -B build \ -DCMAKE_BUILD_TYPE=Release \ -DSFCGAL_BUILD_TESTS=OFF \ -DCMAKE_TOOLCHAIN_FILE="\"$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake\""; \ - cmake --build build --config Release + cmake --build build --config Release -j $env:NUMBER_OF_PROCESSORS # Restore the default Windows shell for correct batch processing. SHELL ["cmd", "/S", "/C"]