diff options
| -rw-r--r-- | .gitlab/ci/configure_common.cmake | 4 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_package.cmake | 4 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index df49b2d..436e582 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -10,4 +10,6 @@ if (NOT "$ENV{CMAKE_BUILD_TYPE}" STREQUAL "") set(CMAKE_BUILD_TYPE "$ENV{CMAKE_BUILD_TYPE}" CACHE STRING "") endif () -include("${CMAKE_CURRENT_LIST_DIR}/configure_sccache.cmake") +if (NOT configure_no_sccache) + include("${CMAKE_CURRENT_LIST_DIR}/configure_sccache.cmake") +endif() diff --git a/.gitlab/ci/configure_macos_package.cmake b/.gitlab/ci/configure_macos_package.cmake index 424bc2b..18ef309 100644 --- a/.gitlab/ci/configure_macos_package.cmake +++ b/.gitlab/ci/configure_macos_package.cmake @@ -20,5 +20,9 @@ set(CMake_INSTALL_DEPENDENCIES "ON" CACHE BOOL "") set(CMAKE_SKIP_RPATH "TRUE" CACHE BOOL "") set(CMake_TEST_NO_FindPackageModeMakefileTest "TRUE" CACHE BOOL "") +# XXX(sccache): restore sccache when it works for multiple architectures: +# https://github.com/mozilla/sccache/issues/847 +set(configure_no_sccache 1) + include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index d9df621..8a006b1 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -115,13 +115,8 @@ script: - *before_script_macos - - .gitlab/ci/sccache.sh - # Allow the server to already be running. - - "sccache --start-server || :" - - sccache --show-stats - ctest -VV -S .gitlab/ci/ctest_configure.cmake - ctest -VV -S .gitlab/ci/ctest_build.cmake - - sccache --show-stats - cd build - cpack -G TGZ - cpack -G DragNDrop |