diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-23 18:00:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-23 18:00:46 (GMT) |
| commit | 86977011000d8134318425df917c7cf943c8559b (patch) | |
| tree | f5c414d4309af9b061cb3c64580d18ec4c28183f /.gitlab-ci.yml | |
| parent | ec5f76753ad92ac03a4581d67a302792e030b6c4 (diff) | |
| parent | 397ced99d73aeec6271d56dd22ba8d2b715d1e7c (diff) | |
| download | CMake-86977011000d8134318425df917c7cf943c8559b.zip CMake-86977011000d8134318425df917c7cf943c8559b.tar.gz CMake-86977011000d8134318425df917c7cf943c8559b.tar.bz2 | |
Merge topic 'ci-macos-arm64'
397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64
73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin
cab41b96ac ci: update to sccache 0.2.15 on linux builds
8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5851
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 83 |
1 files changed, 60 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 672df5a..8e76e41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -236,62 +236,99 @@ upload:linux-aarch64-package: # macOS builds -build:macos-ninja: +build:macos-x86_64-ninja: extends: - - .macos_ninja + - .macos_x86_64_ninja - .cmake_build_macos - .cmake_build_artifacts - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_manually -test:macos-ninja: +build:macos-arm64-ninja: extends: - - .macos_ninja + - .macos_arm64_ninja + - .cmake_build_macos + - .cmake_build_artifacts + - .macos_arm64_builder_tags + - .run_manually + variables: + CMAKE_CI_NO_MR: "true" + +test:macos-x86_64-ninja: + extends: + - .macos_x86_64_ninja + - .cmake_test_macos + - .cmake_test_artifacts + - .macos_x86_64_builder_tags + - .run_dependent + dependencies: + - build:macos-x86_64-ninja + needs: + - build:macos-x86_64-ninja + +test:macos-arm64-ninja: + extends: + - .macos_arm64_ninja - .cmake_test_macos - .cmake_test_artifacts - - .macos_builder_tags + - .macos_arm64_builder_tags - .run_dependent dependencies: - - build:macos-ninja + - build:macos-arm64-ninja needs: - - build:macos-ninja + - build:macos-arm64-ninja + variables: + CMAKE_CI_NO_MR: "true" -build:macos-makefiles: +build:macos-x86_64-makefiles: extends: - - .macos_makefiles + - .macos_x86_64_makefiles - .cmake_build_macos - .cmake_build_artifacts - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_manually -test:macos-makefiles: +test:macos-x86_64-makefiles: extends: - - .macos_makefiles + - .macos_x86_64_makefiles - .cmake_test_macos - - .macos_builder_tags + - .macos_x86_64_builder_tags + - .run_dependent + dependencies: + - build:macos-x86_64-makefiles + needs: + - build:macos-x86_64-makefiles + +test:macos-x86_64-xcode: + extends: + - .macos_x86_64_xcode + - .cmake_test_macos_external + - .macos_x86_64_builder_ext_tags - .run_dependent dependencies: - - build:macos-makefiles + - test:macos-x86_64-ninja needs: - - build:macos-makefiles + - test:macos-x86_64-ninja -test:macos-xcode: +test:macos-arm64-xcode: extends: - - .macos_xcode + - .macos_arm64_xcode - .cmake_test_macos_external - - .macos_builder_ext_tags + - .macos_arm64_builder_ext_tags - .run_dependent dependencies: - - test:macos-ninja + - test:macos-arm64-ninja needs: - - test:macos-ninja + - test:macos-arm64-ninja + variables: + CMAKE_CI_NO_MR: "true" build:macos-package: extends: - .macos_package - .cmake_build_macos_package - .cmake_release_artifacts - - .macos_builder_tags_package + - .macos_x86_64_builder_tags_package - .run_only_for_package dependencies: - prep:doc-package @@ -314,7 +351,7 @@ build:macos10.10-package: - .macos10.10_package - .cmake_build_macos_package - .cmake_release_artifacts - - .macos_builder_tags_package + - .macos_x86_64_builder_tags_package - .run_only_for_package dependencies: - prep:doc-package |