diff options
author | Brad King <brad.king@kitware.com> | 2021-01-26 21:08:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-01-27 15:29:38 (GMT) |
commit | 616bf0d2f033b1b8dcf59d4ec91fa0534d399d15 (patch) | |
tree | e43d4ce8bf5dbd7e08815999378700254ff6fbb6 /.gitlab-ci.yml | |
parent | 227ca689a764b1e3d590d7d47c70769e3baaa846 (diff) | |
download | CMake-616bf0d2f033b1b8dcf59d4ec91fa0534d399d15.zip CMake-616bf0d2f033b1b8dcf59d4ec91fa0534d399d15.tar.gz CMake-616bf0d2f033b1b8dcf59d4ec91fa0534d399d15.tar.bz2 |
gitlab-ci: consolidate release and package job infrastructure
Use `linux_release` in names associated with building or testing
release-style binaries. Add a `.linux_package` helper to adjust
the release binary build behavior for package-specific jobs.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 680d77b..b4bc718 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,8 +93,8 @@ build:fedora33-sphinx: build:centos6-release: extends: - - .release_linux - - .cmake_build_release_linux + - .linux_release_x86_64 + - .cmake_build_linux_release - .cmake_release_artifacts - .linux_builder_tags - .run_manually @@ -102,7 +102,7 @@ build:centos6-release: test:debian10-ninja: extends: - .debian10_ninja - - .cmake_test_linux_package + - .cmake_test_linux_release - .linux_builder_tags_qt - .run_dependent dependencies: @@ -113,7 +113,7 @@ test:debian10-ninja: test:fedora33-makefiles: extends: - .fedora33_makefiles - - .cmake_test_linux_package + - .cmake_test_linux_release - .linux_builder_tags_qt - .run_dependent dependencies: @@ -124,7 +124,7 @@ test:fedora33-makefiles: test:cuda10.2-nvidia: extends: - .cuda10.2_nvidia - - .cmake_test_linux_package + - .cmake_test_linux_release - .linux_builder_tags_cuda - .run_dependent dependencies: @@ -165,8 +165,9 @@ test:fedora33-ninja-multi: build:linux-x86_64-package: extends: - - .linux_package_x86_64 - - .cmake_build_linux_package + - .linux_package + - .linux_release_x86_64 + - .cmake_build_linux_release - .cmake_release_artifacts - .linux_builder_tags - .run_only_for_package @@ -188,8 +189,9 @@ upload:linux-x86_64-package: build:linux-aarch64-package: extends: - - .linux_package_aarch64 - - .cmake_build_linux_package + - .linux_package + - .linux_release_aarch64 + - .cmake_build_linux_release - .cmake_release_artifacts - .linux_builder_tags_aarch64 - .run_only_for_package |