Revert "ci: parallalize build"

This seems to produce some ci failures. This reverts commit 93efa89.
Oslandia · Oct 24, 2024 · f29b0d6 · f29b0d6
1 parent 3de4e4b
commit f29b0d6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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 -j$(nproc)
+    - make
     - 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 -j$(nproc)
+    - make
     - 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 -j$(nproc)
+    - make
     - 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 -j$(nproc)
+    - make
     - ctest -VV
   parallel:
     matrix:

diff --git 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 -j$(nproc)
+    - make
     - 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 -j$(nproc)
+    - make
     - ctest -VV
   parallel:
     matrix:

diff --git 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 -j$(nproc)
+    - cmake --build build
     - ctest --test-dir build --output-on-failure
diff --git 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 -j$(nproc)
+    cmake --build build
 
 FROM debian:stable-slim AS run
 

diff --git 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 -j $env:NUMBER_OF_PROCESSORS
+    cmake --build build --config Release
 
 # Restore the default Windows shell for correct batch processing.
 SHELL ["cmd", "/S", "/C"]