瀏覽代碼

Merge topic 'ci-use-only-needs'

70fd49f0cf Merge branch 'ci-use-only-needs-3.30' into ci-use-only-needs
ea31d090c7 gitlab-ci: remove `dependencies` from jobs

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9964
Brad King 1 年之前
父節點
當前提交
e98b1fc2b4
共有 2 個文件被更改,包括 1 次插入110 次删除
  1. 1 106
      .gitlab-ci.yml
  2. 0 4
      .gitlab/os-linux.yml

+ 1 - 106
.gitlab-ci.yml

@@ -35,7 +35,7 @@ variables:
 # Additionally, jobs may also contain:
 #
 #   - artifacts
-#   - dependency/needs jobs for required jobs
+#   - needs jobs for required jobs
 ################################################################################
 
 # Job prefixes:
@@ -69,8 +69,6 @@ u:source-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - p:source-package
     needs:
         - p:source-package
 
@@ -80,15 +78,12 @@ b:cmake.org-help:
     extends:
         - .cmake_org_help
         - .run_cmake_org_help
-    dependencies: []
     needs: []
 
 u:cmake.org-help:
     extends:
         - .rsync_upload_help
         - .run_cmake_org_help
-    dependencies:
-        - b:cmake.org-help
     needs:
         - b:cmake.org-help
 
@@ -511,8 +506,6 @@ t:fedora41-ninja:
         - .linux_x86_64_tags_x11
         - .cmake_test_artifacts
         - .run_dependent
-    dependencies:
-        - b:fedora41-ninja
     needs:
         - b:fedora41-ninja
     variables:
@@ -525,8 +518,6 @@ t:fedora41-makefiles-symlinked:
         - .linux_x86_64_tags_x11
         - .cmake_test_artifacts
         - .run_dependent
-    dependencies:
-        - b:fedora41-makefiles-symlinked
     needs:
         - b:fedora41-makefiles-symlinked
     variables:
@@ -539,8 +530,6 @@ t:fedora41-ninja-multi:
         - .linux_x86_64_tags
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:fedora41-ninja
     needs:
         - t:fedora41-ninja
 
@@ -762,8 +751,6 @@ b:linux-x86_64-package:
         - .cmake_release_artifacts
         - .linux_x86_64_tags
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -773,8 +760,6 @@ u:linux-x86_64-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:linux-x86_64-package
     needs:
         - b:linux-x86_64-package
 
@@ -786,8 +771,6 @@ b:linux-aarch64-package:
         - .cmake_release_artifacts
         - .linux_aarch64_tags
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -797,8 +780,6 @@ u:linux-aarch64-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:linux-aarch64-package
     needs:
         - b:linux-aarch64-package
 
@@ -820,8 +801,6 @@ t:fedora41-asan:
         - .cmake_memcheck_linux
         - .linux_x86_64_tags
         - .run_dependent
-    dependencies:
-        - b:fedora41-asan
     needs:
         - b:fedora41-asan
     variables:
@@ -885,8 +864,6 @@ t:macos-x86_64-ninja:
         - .cmake_test_artifacts
         - .macos_x86_64_tags
         - .run_dependent
-    dependencies:
-        - b:macos-x86_64-ninja
     needs:
         - b:macos-x86_64-ninja
     variables:
@@ -899,8 +876,6 @@ t:macos-arm64-ninja:
         - .cmake_test_artifacts
         - .macos_arm64_tags
         - .run_dependent
-    dependencies:
-        - b:macos-arm64-ninja
     needs:
         - b:macos-arm64-ninja
     variables:
@@ -914,8 +889,6 @@ t:macos-arm64-ninja-symlinked:
         - .cmake_test_artifacts
         - .macos_arm64_tags
         - .run_dependent
-    dependencies:
-        - b:macos-arm64-ninja-symlinked
     needs:
         - b:macos-arm64-ninja-symlinked
     variables:
@@ -928,8 +901,6 @@ t:macos-arm64-curl:
         - .cmake_test_macos
         - .macos_arm64_tags
         - .run_dependent
-    dependencies:
-        - b:macos-arm64-curl
     needs:
         - b:macos-arm64-curl
     variables:
@@ -949,8 +920,6 @@ t:macos-x86_64-makefiles:
         - .cmake_test_macos
         - .macos_x86_64_tags
         - .run_dependent
-    dependencies:
-        - b:macos-x86_64-makefiles
     needs:
         - b:macos-x86_64-makefiles
 
@@ -961,8 +930,6 @@ t:macos-arm64-ninja-multi:
         - .macos_arm64_tags_ext
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:macos-arm64-ninja
     needs:
         - t:macos-arm64-ninja
     variables:
@@ -975,8 +942,6 @@ t:macos-x86_64-xcode:
         - .macos_x86_64_tags_ext
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:macos-x86_64-ninja
     needs:
         - t:macos-x86_64-ninja
     variables:
@@ -989,8 +954,6 @@ t:macos-arm64-xcode:
         - .macos_arm64_tags_ext
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:macos-arm64-ninja
     needs:
         - t:macos-arm64-ninja
 
@@ -1001,8 +964,6 @@ t:macos-arm64-xcode-symlinked:
         - .macos_arm64_tags_ext
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:macos-arm64-ninja
     needs:
         - t:macos-arm64-ninja
     variables:
@@ -1015,8 +976,6 @@ t:macos-x86_64-ninja-ub:
         - .macos_x86_64_tags_ext
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:macos-x86_64-ninja
     needs:
         - t:macos-x86_64-ninja
     variables:
@@ -1029,8 +988,6 @@ t:macos-arm64-xcode-ub:
         - .macos_arm64_tags_ext
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:macos-arm64-ninja
     needs:
         - t:macos-arm64-ninja
     variables:
@@ -1043,8 +1000,6 @@ b:macos-package:
         - .cmake_release_artifacts
         - .macos_arm64_tags_package
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -1054,8 +1009,6 @@ u:macos-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:macos-package
     needs:
         - b:macos-package
 
@@ -1066,8 +1019,6 @@ b:macos10.10-package:
         - .cmake_release_artifacts
         - .macos_arm64_tags_package
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -1077,8 +1028,6 @@ u:macos10.10-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:macos10.10-package
     needs:
         - b:macos10.10-package
 
@@ -1110,8 +1059,6 @@ t:windows-vs2022-x64-ninja:
         - .windows_x86_64_tags_nonconcurrent_vs2022
         - .cmake_test_artifacts
         - .run_dependent
-    dependencies:
-        - b:windows-vs2022-x64-ninja
     needs:
         - b:windows-vs2022-x64-ninja
     variables:
@@ -1125,8 +1072,6 @@ t:windows-vs2022-x64-ninja-multi:
         - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1138,8 +1083,6 @@ t:windows-vs2022-x64-ninja-multi:
         - .cmake_test_windows_external
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
 
@@ -1164,8 +1107,6 @@ t:windows-vs2019-x64:
         - .windows_x86_64_tags_concurrent_vs2019_android
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1178,8 +1119,6 @@ t:windows-vs2022-x64-nmake:
         - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1192,8 +1131,6 @@ t:windows-vs2022-x64-jom:
         - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1206,8 +1143,6 @@ t:windows-borland5.5:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1220,8 +1155,6 @@ t:windows-borland5.8:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1234,8 +1167,6 @@ t:windows-clang19.1-cl-ninja:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1249,8 +1180,6 @@ t:windows-clang19.1-cl-nmake:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1264,8 +1193,6 @@ t:windows-clang19.1-gnu-ninja:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1279,8 +1206,6 @@ t:windows-clang19.1-gnu-nmake:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1294,8 +1219,6 @@ t:windows-intel2021.9.0-ninja:
         - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1309,8 +1232,6 @@ t:windows-oneapi2024.1.0-ninja:
         - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1324,8 +1245,6 @@ t:mingw_osdn_io-mingw_makefiles:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1338,8 +1257,6 @@ t:mingw_osdn_io-msys_makefiles:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1352,8 +1269,6 @@ t:windows-msvc-v71-nmake:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1366,8 +1281,6 @@ t:windows-openwatcom1.9:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1380,8 +1293,6 @@ t:windows-orangec6.73.1:
         - .windows_x86_64_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-vs2022-x64-ninja
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
@@ -1406,8 +1317,6 @@ t:windows-arm64-vs2022-ninja:
         - .windows_arm64_tags_nonconcurrent_vs2022
         - .cmake_test_artifacts
         - .run_dependent
-    dependencies:
-        - b:windows-arm64-vs2022-ninja
     needs:
         - b:windows-arm64-vs2022-ninja
     variables:
@@ -1420,8 +1329,6 @@ t:windows-arm64-vs2022:
         - .windows_arm64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
-    dependencies:
-        - t:windows-arm64-vs2022-ninja
     needs:
         - t:windows-arm64-vs2022-ninja
     variables:
@@ -1436,8 +1343,6 @@ b:windows-x86_64-package:
         - .cmake_release_artifacts
         - .windows_x86_64_tags_nonconcurrent_vs2022
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -1447,8 +1352,6 @@ u:windows-x86_64-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:windows-x86_64-package
     needs:
         - b:windows-x86_64-package
 
@@ -1459,8 +1362,6 @@ b:windows-i386-package:
         - .cmake_release_artifacts
         - .windows_x86_64_tags_nonconcurrent_vs2022
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -1470,8 +1371,6 @@ u:windows-i386-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:windows-i386-package
     needs:
         - b:windows-i386-package
 
@@ -1482,8 +1381,6 @@ b:windows-arm64-package:
         - .cmake_release_artifacts
         - .windows_x86_64_tags_nonconcurrent_vs2022_arm64
         - .run_only_for_package
-    dependencies:
-        - p:doc-package
     needs:
         - p:doc-package
     variables:
@@ -1493,7 +1390,5 @@ u:windows-arm64-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
-    dependencies:
-        - b:windows-arm64-package
     needs:
         - b:windows-arm64-package

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

@@ -31,14 +31,10 @@
         BOOTSTRAP_ARGS: '-- "-DCMake_DOC_ARTIFACT_PREFIX=$CI_PROJECT_DIR/build/install-doc"'
 
 .needs_centos7_x86_64:
-    dependencies:
-        - b:centos7-x86_64
     needs:
         - b:centos7-x86_64
 
 .needs_centos7_aarch64:
-    dependencies:
-        - b:centos7-aarch64
     needs:
         - b:centos7-aarch64