diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-28 16:55:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-28 16:55:37 (GMT) |
| commit | 04b9b2b5f363d792719238046a18aac867be3254 (patch) | |
| tree | 27699fb7ef3f9f146705652d9c1864c63b086ffb | |
| parent | e46654815e76b492e5f273a147ff6d29f10402c9 (diff) | |
| parent | 35b29d356895b54ca34358a9bacca592903c3346 (diff) | |
| download | CMake-04b9b2b5f363d792719238046a18aac867be3254.zip CMake-04b9b2b5f363d792719238046a18aac867be3254.tar.gz CMake-04b9b2b5f363d792719238046a18aac867be3254.tar.bz2 | |
Merge topic 'macos-pin-xcode-versions'
35b29d3568 ci: disable java detection
72a7697901 gitlab-ci: pin macOS to a specific Xcode version
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4812
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 9 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_makefiles.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_ninja.cmake | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5dde59..f4c4490 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,6 +73,9 @@ # Even if we could, it could change if other runners on the machine # could run at the same time, so we drop it. GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" + # 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.3.app/Contents/Developer" .macos_ninja: &macos_ninja extends: .macos diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake new file mode 100644 index 0000000..4b86d21 --- /dev/null +++ b/.gitlab/ci/configure_macos_common.cmake @@ -0,0 +1,9 @@ +# Our CI machines do not consistently have Java installed, so a build may +# detect that Java is available and working, but a test machine then not have a +# working Java installed. To work around this, just act as if Java is not +# available on any CI machine. +set(Java_JAVA_EXECUTABLE "" CACHE FILEPATH "") +set(Java_JAVAC_EXECUTABLE "" CACHE FILEPATH "") +set(Java_JAR_EXECUTABLE "" CACHE FILEPATH "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_makefiles.cmake index 33f0db0..0f4f194 100644 --- a/.gitlab/ci/configure_macos_makefiles.cmake +++ b/.gitlab/ci/configure_macos_makefiles.cmake @@ -1 +1 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_ninja.cmake index 33f0db0..0f4f194 100644 --- a/.gitlab/ci/configure_macos_ninja.cmake +++ b/.gitlab/ci/configure_macos_ninja.cmake @@ -1 +1 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") |