Преглед на файлове

Merge topic 'ci-rename-jobs' into release-3.22

7d5828e293 gitlab-ci: shorten job prefixes
cfa478e518 gitlab-ci: fix comment typo

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6760
Brad King преди 4 години
родител
ревизия
9f07f1939b
променени са 4 файла, в които са добавени 149 реда и са изтрити 129 реда
  1. 129 122
      .gitlab-ci.yml
  2. 4 4
      .gitlab/os-linux.yml
  3. 3 3
      Help/dev/maint.rst
  4. 13 0
      Help/dev/review.rst

+ 129 - 122
.gitlab-ci.yml

@@ -1,5 +1,5 @@
 include:
-    # Metadata shared my many jobs
+    # Metadata shared by many jobs
     - local: .gitlab/rules.yml
     - local: .gitlab/artifacts.yml
 
@@ -34,9 +34,16 @@ stages:
 #   - dependency/needs jobs for required jobs
 ################################################################################
 
+# Job prefixes:
+#   - `b:` build
+#   - `l:` lint
+#   - `p:` prep
+#   - `t:` test
+#   - `u:` upload
+
 # Prep jobs
 
-prep:source-package:
+p:source-package:
     extends:
         - .linux_prep_source
         - .cmake_prep_source_linux
@@ -44,7 +51,7 @@ prep:source-package:
         - .cmake_release_artifacts
         - .run_only_for_package
 
-prep:doc-package:
+p:doc-package:
     extends:
         - .fedora34_sphinx_package
         - .cmake_prep_doc_linux
@@ -52,74 +59,74 @@ prep:doc-package:
         - .cmake_doc_artifacts
         - .run_only_for_package
 
-.upload:source-package:
+.u:source-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
     dependencies:
-        - prep:source-package
+        - p:source-package
     needs:
-        - prep:source-package
+        - p:source-package
     variables:
         RSYNC_DESTINATION: dev
 
 # Documentation builds
 
-build:help:master:
+b:help:master:
     extends:
         - .cmake_org_help
         - .run_only_for_continuous_master
 
-.upload:help:master:
+.u:help:master:
     extends:
         - .rsync_upload_help
         - .run_only_for_continuous_master
     variables:
         RSYNC_DESTINATION: git-master
     dependencies:
-        - build:help:master
+        - b:help:master
     needs:
-        - build:help:master
+        - b:help:master
 
-build:help:stage:
+b:help:stage:
     extends:
         - .cmake_org_help
         - .run_only_for_continuous_stage
 
-.upload:help:stage:
+.u:help:stage:
     extends:
         - .rsync_upload_help
         - .run_only_for_continuous_stage
     variables:
         RSYNC_DESTINATION: git-stage
     dependencies:
-        - build:help:stage
+        - b:help:stage
     needs:
-        - build:help:stage
+        - b:help:stage
 
 # Lint builds
 
-lint:codespell:
+l:codespell:
     extends:
         - .cmake_codespell_linux
         - .linux_builder_tags
         - .run_automatically
 
-lint:debian10-iwyu:
+l:iwyu-debian10:
     extends:
         - .debian10_iwyu
         - .cmake_build_linux
         - .linux_builder_tags
         - .run_automatically
 
-lint:fedora34-tidy:
+l:tidy-fedora34:
     extends:
         - .fedora34_tidy
         - .cmake_build_linux
         - .linux_builder_tags_qt
         - .run_automatically
 
-lint:fedora34-sphinx:
+l:sphinx-fedora34:
     extends:
         - .fedora34_sphinx
         - .cmake_build_linux
@@ -129,7 +136,7 @@ lint:fedora34-sphinx:
         CMAKE_CI_JOB_CONTINUOUS: "true"
         CMAKE_CI_JOB_HELP: "true"
 
-lint:fedora34-clang-analyzer:
+l:clang-analyzer-fedora34:
     extends:
         - .fedora34_clang_analyzer
         - .cmake_build_linux
@@ -140,7 +147,7 @@ lint:fedora34-clang-analyzer:
 
 # Linux builds
 
-build:centos6-x86_64:
+b:centos6-x86_64:
     extends:
         - .linux_release_x86_64
         - .cmake_build_linux_release
@@ -148,7 +155,7 @@ build:centos6-x86_64:
         - .linux_builder_tags
         - .run_manually
 
-build:centos7-aarch64:
+b:centos7-aarch64:
     extends:
         - .linux_release_aarch64
         - .cmake_build_linux_release
@@ -158,7 +165,7 @@ build:centos7-aarch64:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-test:debian10-ninja:
+t:debian10-ninja:
     extends:
         - .debian10_ninja
         - .cmake_test_linux_release
@@ -169,7 +176,7 @@ test:debian10-ninja:
     variables:
         CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
 
-test:debian10-aarch64-ninja:
+t:debian10-aarch64-ninja:
     extends:
         - .debian10_aarch64_ninja
         - .cmake_test_linux_release
@@ -180,7 +187,7 @@ test:debian10-aarch64-ninja:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-test:debian10-ninja-clang:
+t:debian10-ninja-clang:
     extends:
         - .debian10_ninja_clang
         - .cmake_test_linux_release
@@ -190,7 +197,7 @@ test:debian10-ninja-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-test:debian10-makefiles-clang:
+t:debian10-makefiles-clang:
     extends:
         - .debian10_makefiles_clang
         - .cmake_test_linux_release
@@ -200,7 +207,7 @@ test:debian10-makefiles-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-test:fedora34-makefiles:
+t:fedora34-makefiles:
     extends:
         - .fedora34_makefiles
         - .cmake_test_linux_release
@@ -208,7 +215,7 @@ test:fedora34-makefiles:
         - .run_dependent
         - .needs_centos6_x86_64
 
-test:fedora34-makefiles-nospace:
+t:fedora34-makefiles-nospace:
     extends:
         - .fedora34_makefiles
         - .cmake_test_linux_release
@@ -221,7 +228,7 @@ test:fedora34-makefiles-nospace:
         CMAKE_CI_BUILD_NAME: fedora34_makefiles_nospace
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-test:cuda9.2-nvidia:
+t:cuda9.2-nvidia:
     extends:
         - .cuda9.2_nvidia
         - .cmake_test_linux_release
@@ -231,7 +238,7 @@ test:cuda9.2-nvidia:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-test:cuda10.2-nvidia:
+t:cuda10.2-nvidia:
     extends:
         - .cuda10.2_nvidia
         - .cmake_test_linux_release
@@ -240,7 +247,7 @@ test:cuda10.2-nvidia:
         - .run_dependent
         - .needs_centos6_x86_64
 
-test:cuda10.2-clang:
+t:cuda10.2-clang:
     extends:
         - .cuda10.2_clang
         - .cmake_test_linux_release
@@ -250,7 +257,7 @@ test:cuda10.2-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-test:hip4.2-radeon:
+t:hip4.2-radeon:
     extends:
         - .hip4.2_radeon
         - .cmake_test_linux_release
@@ -260,7 +267,7 @@ test:hip4.2-radeon:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-build:fedora34-ninja:
+b:fedora34-ninja:
     extends:
         - .fedora34_ninja
         - .cmake_build_linux
@@ -268,7 +275,7 @@ build:fedora34-ninja:
         - .linux_builder_tags_qt
         - .run_manually
 
-test:fedora34-ninja:
+t:fedora34-ninja:
     extends:
         - .fedora34_ninja
         - .cmake_test_linux
@@ -276,11 +283,11 @@ test:fedora34-ninja:
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - build:fedora34-ninja
+        - b:fedora34-ninja
     needs:
-        - build:fedora34-ninja
+        - b:fedora34-ninja
 
-test:fedora34-ninja-multi:
+t:fedora34-ninja-multi:
     extends:
         - .fedora34_ninja_multi
         - .cmake_test_linux_external
@@ -288,228 +295,228 @@ test:fedora34-ninja-multi:
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:fedora34-ninja
+        - t:fedora34-ninja
     needs:
-        - test:fedora34-ninja
+        - t:fedora34-ninja
 
-test:intel2016-makefiles:
+t:intel2016-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2016_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2016-el7
 
-test:intel2016u1-makefiles:
+t:intel2016u1-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2016u1_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2016u1-el7
 
-test:intel2016u2-makefiles:
+t:intel2016u2-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2016u2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2016u2-el7
 
-test:intel2017-makefiles:
+t:intel2017-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017-el7
 
-test:intel2017u1-makefiles:
+t:intel2017u1-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u1_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u1-el7
 
-test:intel2017u2-makefiles:
+t:intel2017u2-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u2-el7
 
-test:intel2017u3-makefiles:
+t:intel2017u3-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u3_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u3-el7
 
-test:intel2017u4-makefiles:
+t:intel2017u4-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u4_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u4-el7
 
-test:intel2017u5-makefiles:
+t:intel2017u5-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u5_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u5-el7
 
-test:intel2017u6-makefiles:
+t:intel2017u6-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u6_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u6-el7
 
-test:intel2017u7-makefiles:
+t:intel2017u7-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u7_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u7-el7
 
-test:intel2017u8-makefiles:
+t:intel2017u8-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2017u8_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2017u8-el7
 
-test:intel2018-makefiles:
+t:intel2018-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2018_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2018-el7
 
-test:intel2018u1-makefiles:
+t:intel2018u1-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2018u1_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2018u1-el7
 
-test:intel2018u2-makefiles:
+t:intel2018u2-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2018u2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2018u2-el7
 
-test:intel2018u3-makefiles:
+t:intel2018u3-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2018u3_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2018u3-el7
 
-test:intel2018u4-makefiles:
+t:intel2018u4-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2018u4_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2018u4-el7
 
-test:intel2019-makefiles:
+t:intel2019-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2019_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2019-el7
 
-test:intel2019u1-makefiles:
+t:intel2019u1-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2019u1_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2019u1-el7
 
-test:intel2019u2-makefiles:
+t:intel2019u2-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2019u2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2019u2-el7
 
-test:intel2019u3-makefiles:
+t:intel2019u3-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2019u3_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2019u3-el7
 
-test:intel2019u4-makefiles:
+t:intel2019u4-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2019u4_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2019u4-el7
 
-test:intel2020-makefiles:
+t:intel2020-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2020_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2020-el8
 
-test:intel2020u2-makefiles:
+t:intel2020u2-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2020u2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2020u2-el8
 
-test:intel2020u4-makefiles:
+t:intel2020u4-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2020u4_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2020u4-el8
 
-test:intel2021.1.1-makefiles:
+t:intel2021.1.1-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2021.1.1_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2021.1.1-el8
 
-test:intel2021.1.2-makefiles:
+t:intel2021.1.2-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2021.1.2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2021.1.2-el8
 
-test:intel2021.2.0-makefiles:
+t:intel2021.2.0-makefiles:
     extends:
         - .cmake_test_linux_intelclassic_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: intel2021.2.0_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2021.2.0-el8
 
-test:oneapi2021.1.1-makefiles:
+t:oneapi2021.1.1-makefiles:
     extends:
         - .cmake_test_linux_inteloneapi_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: oneapi2021.1.1_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2021.1.1-el8
 
-test:oneapi2021.1.2-makefiles:
+t:oneapi2021.1.2-makefiles:
     extends:
         - .cmake_test_linux_inteloneapi_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: oneapi2021.1.2_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2021.1.2-el8
 
-test:oneapi2021.2.0-makefiles:
+t:oneapi2021.2.0-makefiles:
     extends:
         - .cmake_test_linux_inteloneapi_makefiles
     variables:
         CMAKE_CI_BUILD_NAME: oneapi2021.2.0_makefiles
         CMAKE_CI_INTELCOMPILER_IMAGE_TAG: 2021.2.0-el8
 
-build:linux-x86_64-package:
+b:linux-x86_64-package:
     extends:
         - .linux_package
         - .linux_release_x86_64
@@ -518,22 +525,22 @@ build:linux-x86_64-package:
         - .linux_builder_tags
         - .run_only_for_package
     dependencies:
-        - prep:doc-package
+        - p:doc-package
     needs:
-        - prep:doc-package
+        - p:doc-package
 
-.upload:linux-x86_64-package:
+.u:linux-x86_64-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
     dependencies:
-        - build:linux-x86_64-package
+        - b:linux-x86_64-package
     needs:
-        - build:linux-x86_64-package
+        - b:linux-x86_64-package
     variables:
         RSYNC_DESTINATION: dev
 
-build:linux-aarch64-package:
+b:linux-aarch64-package:
     extends:
         - .linux_package
         - .linux_release_aarch64
@@ -542,24 +549,24 @@ build:linux-aarch64-package:
         - .linux_builder_tags_aarch64
         - .run_only_for_package
     dependencies:
-        - prep:doc-package
+        - p:doc-package
     needs:
-        - prep:doc-package
+        - p:doc-package
 
-.upload:linux-aarch64-package:
+.u:linux-aarch64-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
     dependencies:
-        - build:linux-aarch64-package
+        - b:linux-aarch64-package
     needs:
-        - build:linux-aarch64-package
+        - b:linux-aarch64-package
     variables:
         RSYNC_DESTINATION: dev
 
 ## Sanitizer builds
 
-build:fedora34-asan:
+b:fedora34-asan:
     extends:
         - .fedora34_asan
         - .cmake_build_linux
@@ -569,22 +576,22 @@ build:fedora34-asan:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-test:fedora34-asan:
+t:fedora34-asan:
     extends:
         - .fedora34_asan
         - .cmake_memcheck_linux
         - .linux_builder_tags_qt
         - .run_dependent
     dependencies:
-        - build:fedora34-asan
+        - b:fedora34-asan
     needs:
-        - build:fedora34-asan
+        - b:fedora34-asan
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 # macOS builds
 
-build:macos-x86_64-ninja:
+b:macos-x86_64-ninja:
     extends:
         - .macos_x86_64_ninja
         - .cmake_build_macos
@@ -592,7 +599,7 @@ build:macos-x86_64-ninja:
         - .macos_x86_64_builder_tags
         - .run_manually
 
-build:macos-arm64-ninja:
+b:macos-arm64-ninja:
     extends:
         - .macos_arm64_ninja
         - .cmake_build_macos
@@ -602,7 +609,7 @@ build:macos-arm64-ninja:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-test:macos-x86_64-ninja:
+t:macos-x86_64-ninja:
     extends:
         - .macos_x86_64_ninja
         - .cmake_test_macos
@@ -610,13 +617,13 @@ test:macos-x86_64-ninja:
         - .macos_x86_64_builder_tags
         - .run_dependent
     dependencies:
-        - build:macos-x86_64-ninja
+        - b:macos-x86_64-ninja
     needs:
-        - build:macos-x86_64-ninja
+        - b:macos-x86_64-ninja
     variables:
         CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
 
-test:macos-arm64-ninja:
+t:macos-arm64-ninja:
     extends:
         - .macos_arm64_ninja
         - .cmake_test_macos
@@ -624,13 +631,13 @@ test:macos-arm64-ninja:
         - .macos_arm64_builder_tags
         - .run_dependent
     dependencies:
-        - build:macos-arm64-ninja
+        - b:macos-arm64-ninja
     needs:
-        - build:macos-arm64-ninja
+        - b:macos-arm64-ninja
     variables:
         CMAKE_CI_NO_MR: "true"
 
-build:macos-x86_64-makefiles:
+b:macos-x86_64-makefiles:
     extends:
         - .macos_x86_64_makefiles
         - .cmake_build_macos
@@ -638,18 +645,18 @@ build:macos-x86_64-makefiles:
         - .macos_x86_64_builder_tags
         - .run_manually
 
-test:macos-x86_64-makefiles:
+t:macos-x86_64-makefiles:
     extends:
         - .macos_x86_64_makefiles
         - .cmake_test_macos
         - .macos_x86_64_builder_tags
         - .run_dependent
     dependencies:
-        - build:macos-x86_64-makefiles
+        - b:macos-x86_64-makefiles
     needs:
-        - build:macos-x86_64-makefiles
+        - b:macos-x86_64-makefiles
 
-test:macos-x86_64-xcode:
+t:macos-x86_64-xcode:
     extends:
         - .macos_x86_64_xcode
         - .cmake_test_macos_external
@@ -657,11 +664,11 @@ test:macos-x86_64-xcode:
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:macos-x86_64-ninja
+        - t:macos-x86_64-ninja
     needs:
-        - test:macos-x86_64-ninja
+        - t:macos-x86_64-ninja
 
-test:macos-arm64-xcode:
+t:macos-arm64-xcode:
     extends:
         - .macos_arm64_xcode
         - .cmake_test_macos_external
@@ -669,13 +676,13 @@ test:macos-arm64-xcode:
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:macos-arm64-ninja
+        - t:macos-arm64-ninja
     needs:
-        - test:macos-arm64-ninja
+        - t:macos-arm64-ninja
     variables:
         CMAKE_CI_NO_MR: "true"
 
-build:macos-package:
+b:macos-package:
     extends:
         - .macos_package
         - .cmake_build_macos_package
@@ -683,22 +690,22 @@ build:macos-package:
         - .macos_x86_64_builder_tags_package
         - .run_only_for_package
     dependencies:
-        - prep:doc-package
+        - p:doc-package
     needs:
-        - prep:doc-package
+        - p:doc-package
 
-.upload:macos-package:
+.u:macos-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
     dependencies:
-        - build:macos-package
+        - b:macos-package
     needs:
-        - build:macos-package
+        - b:macos-package
     variables:
         RSYNC_DESTINATION: dev
 
-build:macos10.10-package:
+b:macos10.10-package:
     extends:
         - .macos10.10_package
         - .cmake_build_macos_package
@@ -706,24 +713,24 @@ build:macos10.10-package:
         - .macos_x86_64_builder_tags_package
         - .run_only_for_package
     dependencies:
-        - prep:doc-package
+        - p:doc-package
     needs:
-        - prep:doc-package
+        - p:doc-package
 
-.upload:macos10.10-package:
+.u:macos10.10-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
     dependencies:
-        - build:macos10.10-package
+        - b:macos10.10-package
     needs:
-        - build:macos10.10-package
+        - b:macos10.10-package
     variables:
         RSYNC_DESTINATION: dev
 
 # Windows builds
 
-build:windows-vs2022-x64-ninja:
+b:windows-vs2022-x64-ninja:
     extends:
         - .windows_vs2022_x64_ninja
         - .cmake_build_windows
@@ -731,7 +738,7 @@ build:windows-vs2022-x64-ninja:
         - .windows_tags_nonconcurrent_vs2022
         - .run_manually
 
-test:windows-vs2022-x64-ninja:
+t:windows-vs2022-x64-ninja:
     extends:
         - .windows_vs2022_x64_ninja
         - .cmake_test_windows
@@ -739,11 +746,11 @@ test:windows-vs2022-x64-ninja:
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - build:windows-vs2022-x64-ninja
+        - b:windows-vs2022-x64-ninja
     needs:
-        - build:windows-vs2022-x64-ninja
+        - b:windows-vs2022-x64-ninja
 
-test:windows-vs2022-x64:
+t:windows-vs2022-x64:
     extends:
         - .windows_vs2022_x64
         - .cmake_test_windows_external
@@ -751,6 +758,6 @@ test:windows-vs2022-x64:
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:windows-vs2022-x64-ninja
+        - t:windows-vs2022-x64-ninja
     needs:
-        - test:windows-vs2022-x64-ninja
+        - t:windows-vs2022-x64-ninja

+ 4 - 4
.gitlab/os-linux.yml

@@ -32,15 +32,15 @@
 
 .needs_centos6_x86_64:
     dependencies:
-        - build:centos6-x86_64
+        - b:centos6-x86_64
     needs:
-        - build:centos6-x86_64
+        - b:centos6-x86_64
 
 .needs_centos7_aarch64:
     dependencies:
-        - build:centos7-aarch64
+        - b:centos7-aarch64
     needs:
-        - build:centos7-aarch64
+        - b:centos7-aarch64
 
 ### Debian
 

+ 3 - 3
Help/dev/maint.rst

@@ -245,12 +245,12 @@ Commit with a message such as::
   Release versions do not have the development topic section of
   the CMake Release Notes index page.
 
-Update ``.gitlab-ci.yml`` to drop the ``upload:`` jobs from the
+Update ``.gitlab-ci.yml`` to drop the upload jobs from the
 packaging pipeline by renaming them to start in ``.``:
 
 .. code-block:: shell
 
-  sed -i 's/^upload:/.upload:/' .gitlab-ci.yml
+  sed -i 's/^u:/.u:/' .gitlab-ci.yml
 
 Commit with a message such as::
 
@@ -298,7 +298,7 @@ the version date from ``origin/master``:
   git checkout origin/master -- \
     Source/CMakeVersion.cmake Help/release/dev/0-sample-topic.rst
   sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst
-  sed -i 's/^\.upload:/upload:/' .gitlab-ci.yml
+  sed -i 's/^\.u:/u:/' .gitlab-ci.yml
 
 Update ``Source/CMakeVersion.cmake`` to set the version to
 ``$major.$minor.$date``:

+ 13 - 0
Help/dev/review.rst

@@ -324,6 +324,19 @@ Heavier jobs require a manual trigger to run:
     * ``failed``: Restart jobs which have completed, but without success.
     * ``completed``: Restart all completed jobs.
 
+
+In order to keep job names shorter and keep as much information visible on the
+GitLab web interface as possible, jobs have a short prefix which indicates
+what its main purpose is:
+
+  * ``b:`` jobs build CMake for the purposes of running the
+    test suite.
+  * ``l:`` jobs perform "linting" on the CMake source tree such as static
+    analysis.
+  * ``p:`` jobs perform preparatory tasks for use in other jobs.
+  * ``t:`` jobs perform testing of CMake.
+  * ``u:`` jobs upload other job results to permanent locations.
+
 If the merge request topic branch is updated by a push, a new manual trigger
 using one of the above methods is needed to start CI again.