diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-29 10:35:14 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-09-29 11:13:14 -0400 |
| commit | 17decc46917f26199abe6e00a028d35497972d40 (patch) | |
| tree | 5d8ba57e19d006b5acee96a417e4962e6511e04c /.gitlab-ci.yml | |
| parent | 39677de5e209445c8cbc5957c1e79088d5d2a03a (diff) | |
| download | cmake-17decc46917f26199abe6e00a028d35497972d40.tar.gz | |
gitlab-ci: re-organize packaging pipeline
Move the macOS package build job into the `build` stage. Since it
depends on the sphinx doc package job, add a preceding `prep` stage.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4ebb02219..06de7e4933 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,9 @@ include: - local: .gitlab/upload.yml stages: + - prep - build - test - - package - test-ext - upload @@ -34,6 +34,16 @@ stages: # - dependency/needs jobs for required jobs ################################################################################ +# Prep jobs + +prep:doc: + extends: + - .fedora31_sphinx_package + - .cmake_prep_doc_linux + - .linux_builder_tags_qt + - .cmake_doc_artifacts + - .run_only_for_package + # Lint builds build:debian10-iwyu: @@ -57,14 +67,6 @@ build:fedora31-sphinx: - .linux_builder_tags_qt - .run_automatically -build:fedora31-sphinx-package: - extends: - - .fedora31_sphinx_package - - .cmake_build_linux - - .linux_builder_tags_qt - - .cmake_doc_artifacts - - .run_only_for_package - # Linux builds build:centos6-release: @@ -180,7 +182,7 @@ test:macos-xcode: needs: - test:macos-ninja -package:macos: +build:macos-package: extends: - .macos_package - .cmake_build_macos_package @@ -188,18 +190,18 @@ package:macos: - .macos_builder_tags_package - .run_only_for_package dependencies: - - build:fedora31-sphinx-package + - prep:doc needs: - - build:fedora31-sphinx-package + - prep:doc upload:macos: extends: - .rsync_upload - .run_only_for_package dependencies: - - package:macos + - build:macos-package needs: - - package:macos + - build:macos-package variables: RSYNC_DESTINATION: dev |