Commit 7f0d186f authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov

Merge branch 'ci-gui-no-ctest' into 'master'

[ci] Do not run ctests on gui builds.

See merge request ogs/ogs!3025
parents 8f7c60c7 73bc58f5
......@@ -18,6 +18,8 @@ variables:
# Build config
BUILD_TYPE: Release
BUILD_PROCESSES: "" # Empty string: builds all processes
BUILD_TESTS: "true"
BUILD_CTEST: "true"
include:
- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
......
......@@ -23,9 +23,9 @@
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
- $BUILD_CMD_PREFIX cmake --build . > >(tee make.output)
- $BUILD_CMD_PREFIX cmake --build . --target tests
- $BUILD_CMD_PREFIX cmake --build . --target ctest
- cp Testing/**/Test.xml Tests/ctest.xml
- if $BUILD_TESTS ; then $BUILD_CMD_PREFIX cmake --build . --target tests ; fi
- if $BUILD_CTEST ; then $BUILD_CMD_PREFIX cmake --build . --target ctest ; fi
- if $BUILD_CTEST ; then cp Testing/**/Test.xml Tests/ctest.xml ; fi
cache:
paths:
......
......@@ -14,9 +14,9 @@
-DCMAKE_BUILD_TYPE="$env:BUILD_TYPE"
-DOGS_BUILD_PROCESSES="$env:BUILD_PROCESSES"
- cmake --build . --target package | Tee-Object -FilePath make.output
- cmake --build . --target tests
- cmake --build . --target ctest
- cp Testing/**/Test.xml Tests/ctest.xml
- if($env:BUILD_TESTS -eq "true") { cmake --build . --target tests }
- if($env:BUILD_CTEST -eq "true") { cmake --build . --target ctest }
- if($env:BUILD_CTEST -eq "true") { cp Testing/**/Test.xml Tests/ctest.xml }
artifacts:
paths:
- $BUILD_DIR/Tests/ctest.xml
......
......@@ -18,6 +18,7 @@ build gui linux:
allow_failure: true
variables:
BUILD_DIR: "build-gui-linux"
BUILD_CTEST: "false"
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
-DOGS_BUILD_GUI=ON
......
......@@ -16,6 +16,7 @@ build gui mac:
variables:
BUILD_DIR: "build-gui-mac"
BUILD_CTEST: "false"
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
-DOGS_USE_PCH=OFF
......
......@@ -14,6 +14,7 @@ build gui win:
variables:
BUILD_DIR: build-gui-win
BUILD_CTEST: "false"
CMAKE_ARGS: >-
-DOGS_USE_PYTHON=ON
-DOGS_BUILD_GUI=ON
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment