Skip to content
Snippets Groups Projects
Verified Commit 44c108b8 authored by Lars Bilke's avatar Lars Bilke
Browse files

[ci] Removed BUILD_PROCESSES variable.

This variable set the CMake variable OGS_BUILD_PROCESSES but since
!3983 OGS_BUILD_PROCESSES and OGS_BUILD_PROCESS_XX should not be
set together.

The recent timeouts were because the disabling of TH2M was overriden
by OGS_BUILD_PROCESSES=ON on Windows.
parent 2080a6ad
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,6 @@ stages:
variables:
# Build config
BUILD_TYPE: Release
BUILD_PROCESSES: "ON" # or OFF or ;-separated list of processes
BUILD_TESTS: "true"
BUILD_CTEST: "true"
CPU_TARGET: ivybridge # envinf1 has oldest cpu
......
......@@ -15,7 +15,7 @@
- ([ "${CONAN_USER_HOME}" == "${CI_PROJECT_DIR}/.conan" ]) && conan remove --system-reqs '*'
- ([[ $BUILD_CTEST_LARGE_ON_MASTER && "${CI_COMMIT_BRANCH}" == "master" && "${CMAKE_ARGS}" == *"USE_PYTHON=ON"* ]]) && export BUILD_CTEST_LARGE=true
script:
- cmake -S . --preset=$CMAKE_PRESET -Wno-dev $CMAKE_ARGS -DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
- cmake -S . --preset=$CMAKE_PRESET -Wno-dev $CMAKE_ARGS
- |
if [[ -z "$TARGETS" ]]; then
......
......@@ -15,8 +15,7 @@
- mkdir build
# Create symlink https://stackoverflow.com/a/34905638/80480
- cmd /c mklink /D build\$env:CMAKE_PRESET $env:CI_PROJECT_DIR\$build_directory_full
- $cmake_cmd = "cmake -S . --preset=$env:CMAKE_PRESET -Wno-dev $env:CMAKE_ARGS
-DOGS_BUILD_PROCESSES=$env:BUILD_PROCESSES"
- $cmake_cmd = "cmake -S . --preset=$env:CMAKE_PRESET -Wno-dev $env:CMAKE_ARGS"
- $cmake_cmd
- Invoke-Expression $cmake_cmd
- cmake --build --preset=$env:CMAKE_PRESET --target package | Tee-Object -FilePath $log_file
......
......@@ -56,7 +56,7 @@ build linux (no deps, no procs):
variables:
BUILD_TESTS: "false"
BUILD_CTEST: "false"
BUILD_PROCESSES: "SteadyStateDiffusion"
CMAKE_ARGS: -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
CMAKE_PRESET: ci-simplest
build linux arch:
......
......@@ -3,7 +3,7 @@ check header:
allow_failure: true
extends:
- .rules-master-manual
needs: [ meta, ci_images ]
needs: [meta, ci_images]
variables:
BUILD_DIR: "../build/check-header"
CMAKE_ARGS: "-DOGS_CHECK_HEADER_COMPILATION=ON -DOGS_BUILD_GUI=ON -DBUILD_SHARED_LIBS=OFF -DOGS_USE_POETRY=OFF"
......@@ -16,4 +16,4 @@ check header:
cmake ../../ogs -G Ninja
$CMAKE_ARGS
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES || (cat CMakeFiles/CMakeError.log; exit 1)
|| (cat CMakeFiles/CMakeError.log; exit 1)
......@@ -2,7 +2,7 @@ clang sanitizer:
stage: check
extends:
- .rules-manual
needs: [ ci_images ]
needs: [ci_images]
variables:
BUILD_DIR: "../build/sanitizer"
CMAKE_ARGS: "-DOGS_ADDRESS_SANITIZER=ON -DOGS_UNDEFINED_BEHAVIOR_SANITIZER=ON"
......@@ -17,6 +17,5 @@ clang sanitizer:
cmake .. -G Ninja
$CMAKE_ARGS
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
- cmake --build . --target tests || true
- cmake --build . --target ctest || true
......@@ -15,7 +15,6 @@ clang tidy:
cmake .. -G Ninja
$CMAKE_ARGS
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
- cmake --build . > >(tee make.txt)
artifacts:
# No report yet: https://gitlab.com/gitlab-org/gitlab/-/issues/3985
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment