diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 93 |
1 files changed, 65 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a322aa6..8e76e41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ prep:doc-package: - .cmake_doc_artifacts - .run_only_for_package -.upload:source-package: +upload:source-package: extends: - .rsync_upload - .run_only_for_package @@ -199,7 +199,7 @@ build:linux-x86_64-package: needs: - prep:doc-package -.upload:linux-x86_64-package: +upload:linux-x86_64-package: extends: - .rsync_upload - .run_only_for_package @@ -223,7 +223,7 @@ build:linux-aarch64-package: needs: - prep:doc-package -.upload:linux-aarch64-package: +upload:linux-aarch64-package: extends: - .rsync_upload - .run_only_for_package @@ -236,69 +236,106 @@ build: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 needs: - prep:doc-package -.upload:macos-package: +upload:macos-package: extends: - .rsync_upload - .run_only_for_package @@ -314,14 +351,14 @@ 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 needs: - prep:doc-package -.upload:macos10.10-package: +upload:macos10.10-package: extends: - .rsync_upload - .run_only_for_package |