diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-28 15:29:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-28 15:29:40 (GMT) |
| commit | dd0743fdf80016096077e7689fe8698ab1159098 (patch) | |
| tree | 319a0e2390c8500c504956c1951111a8a8e25bcd | |
| parent | 1b03ac7da76c05bfa60e5fcf95aa2bfdf64f27cf (diff) | |
| parent | e80362252fbb06b2e71b9e46076ff2342e4ae353 (diff) | |
| download | CMake-dd0743fdf80016096077e7689fe8698ab1159098.zip CMake-dd0743fdf80016096077e7689fe8698ab1159098.tar.gz CMake-dd0743fdf80016096077e7689fe8698ab1159098.tar.bz2 | |
Merge topic 'ci-tweaks'
e80362252f ci: support a max parallelism for tests
93a745683b sccache: use a different port for CMake builds
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5287
| -rw-r--r-- | .gitlab/ci/ctest_test.cmake | 5 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab/ci/ctest_test.cmake b/.gitlab/ci/ctest_test.cmake index 569139d..08ef18f 100644 --- a/.gitlab/ci/ctest_test.cmake +++ b/.gitlab/ci/ctest_test.cmake @@ -10,6 +10,11 @@ ctest_start(APPEND) include(ProcessorCount) ProcessorCount(nproc) +if (NOT "$ENV{CTEST_MAX_PARALLELISM}" STREQUAL "") + if (nproc GREATER "$ENV{CTEST_MAX_PARALLELISM}") + set(nproc "$ENV{CTEST_MAX_PARALLELISM}") + endif () +endif () include("${CMAKE_CURRENT_LIST_DIR}/ctest_exclusions.cmake") ctest_test( diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 96ec264..47e81d1 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -8,6 +8,8 @@ # TODO: Factor this out so that each job selects the Xcode version to # use so that different versions can be tested in a single pipeline. DEVELOPER_DIR: "/Applications/Xcode-11.7.app/Contents/Developer" + # Avoid conflicting with other projects running on the same machine. + SCCACHE_SERVER_PORT: 4227 ### Build and test diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 63b8758..61a2018 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -5,6 +5,8 @@ .windows: variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci ext\\$CI_CONCURRENT_ID" + # Avoid conflicting with other projects running on the same machine. + SCCACHE_SERVER_PORT: 4227 ### Build and test |