diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 60 |
1 files changed, 43 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c9865e..5f48a02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ stages: # Prep jobs -prep:source: +prep:source-package: extends: - .linux_prep_source - .cmake_prep_source_linux @@ -44,7 +44,7 @@ prep:source: - .cmake_release_artifacts - .run_only_for_package -prep:doc: +prep:doc-package: extends: - .fedora31_sphinx_package - .cmake_prep_doc_linux @@ -52,14 +52,14 @@ prep:doc: - .cmake_doc_artifacts - .run_only_for_package -upload:source: +upload:source-package: extends: - .rsync_upload - .run_only_for_package dependencies: - - prep:source + - prep:source-package needs: - - prep:source + - prep:source-package variables: RSYNC_DESTINATION: dev @@ -85,6 +85,9 @@ build:fedora31-sphinx: - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically + variables: + CMAKE_CI_JOB_CONTINUOUS: "true" + CMAKE_CI_JOB_HELP: "true" # Linux builds @@ -101,7 +104,7 @@ test:fedora31-makefiles: - .fedora31_makefiles - .cmake_test_linux_package - .linux_builder_tags_qt - - .run_automatically + - .run_dependent dependencies: - build:centos6-release needs: @@ -112,7 +115,7 @@ test:cuda10.2-nvidia: - .cuda10.2_nvidia - .cmake_test_linux_package - .linux_builder_tags_cuda - - .run_automatically + - .run_dependent dependencies: - build:centos6-release needs: @@ -132,7 +135,7 @@ test:fedora31-ninja: - .cmake_test_linux - .linux_builder_tags_x11 - .cmake_test_artifacts - - .run_automatically + - .run_dependent dependencies: - build:fedora31-ninja needs: @@ -143,12 +146,35 @@ test:fedora31-ninja-multi: - .fedora31_ninja_multi - .cmake_test_linux_external - .linux_builder_tags_qt - - .run_automatically + - .run_dependent dependencies: - test:fedora31-ninja needs: - test:fedora31-ninja +build:linux-x86_64-package: + extends: + - .linux_package_x86_64 + - .cmake_build_linux_package + - .cmake_release_artifacts + - .linux_builder_tags + - .run_only_for_package + dependencies: + - prep:doc-package + needs: + - prep:doc-package + +upload:linux-x86_64-package: + extends: + - .rsync_upload + - .run_only_for_package + dependencies: + - build:linux-x86_64-package + needs: + - build:linux-x86_64-package + variables: + RSYNC_DESTINATION: dev + # macOS builds build:macos-ninja: @@ -165,7 +191,7 @@ test:macos-ninja: - .cmake_test_macos - .cmake_test_artifacts - .macos_builder_tags - - .run_automatically + - .run_dependent dependencies: - build:macos-ninja needs: @@ -184,7 +210,7 @@ test:macos-makefiles: - .macos_makefiles - .cmake_test_macos - .macos_builder_tags - - .run_automatically + - .run_dependent dependencies: - build:macos-makefiles needs: @@ -195,7 +221,7 @@ test:macos-xcode: - .macos_xcode - .cmake_test_macos_external - .macos_builder_ext_tags - - .run_automatically + - .run_dependent dependencies: - test:macos-ninja needs: @@ -209,11 +235,11 @@ build:macos-package: - .macos_builder_tags_package - .run_only_for_package dependencies: - - prep:doc + - prep:doc-package needs: - - prep:doc + - prep:doc-package -upload:macos: +upload:macos-package: extends: - .rsync_upload - .run_only_for_package @@ -240,7 +266,7 @@ test:windows-vs2019-x64-ninja: - .cmake_test_windows - .windows_builder_tags - .cmake_test_artifacts - - .run_automatically + - .run_dependent dependencies: - build:windows-vs2019-x64-ninja needs: @@ -251,7 +277,7 @@ test:windows-vs2019-x64: - .windows_vs2019_x64 - .cmake_test_windows_external - .windows_builder_ext_tags - - .run_automatically + - .run_dependent dependencies: - test:windows-vs2019-x64-ninja needs: |