gitlab-ci: remove dependencies from jobs
Historically, `needs` specifies the jobs which need to complete successfully and `dependencies` specifies the jobs which provide artifacts which should be used. Modern GitLab discourages using both as `needs` now supports an `artifacts` key to say "depend on but do not use artifacts", so remove `dependencies` and use `needs:artifacts` where necessary. See: https://docs.gitlab.com/ee/ci/yaml/#needsartifacts
This commit is contained in:
Ben Boeckel
parent
9c4a0a9ff0
commit
ea31d090c7
107
.gitlab-ci.yml
107
.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
|
||||
|
||||
@ -480,8 +475,6 @@ t:fedora40-ninja:
|
||||
- .linux_x86_64_tags_x11
|
||||
- .cmake_test_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:fedora40-ninja
|
||||
needs:
|
||||
- b:fedora40-ninja
|
||||
variables:
|
||||
@ -494,8 +487,6 @@ t:fedora40-makefiles-symlinked:
|
||||
- .linux_x86_64_tags_x11
|
||||
- .cmake_test_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:fedora40-makefiles-symlinked
|
||||
needs:
|
||||
- b:fedora40-makefiles-symlinked
|
||||
variables:
|
||||
@ -508,8 +499,6 @@ t:fedora40-ninja-multi:
|
||||
- .linux_x86_64_tags
|
||||
- .cmake_junit_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- t:fedora40-ninja
|
||||
needs:
|
||||
- t:fedora40-ninja
|
||||
|
||||
@ -724,8 +713,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:
|
||||
@ -735,8 +722,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
|
||||
|
||||
@ -748,8 +733,6 @@ b:linux-aarch64-package:
|
||||
- .cmake_release_artifacts
|
||||
- .linux_aarch64_tags
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- p:doc-package
|
||||
needs:
|
||||
- p:doc-package
|
||||
variables:
|
||||
@ -759,8 +742,6 @@ u:linux-aarch64-package:
|
||||
extends:
|
||||
- .rsync_upload_package
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- b:linux-aarch64-package
|
||||
needs:
|
||||
- b:linux-aarch64-package
|
||||
|
||||
@ -782,8 +763,6 @@ t:fedora40-asan:
|
||||
- .cmake_memcheck_linux
|
||||
- .linux_x86_64_tags
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:fedora40-asan
|
||||
needs:
|
||||
- b:fedora40-asan
|
||||
variables:
|
||||
@ -847,8 +826,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:
|
||||
@ -861,8 +838,6 @@ t:macos-arm64-ninja:
|
||||
- .cmake_test_artifacts
|
||||
- .macos_arm64_tags
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:macos-arm64-ninja
|
||||
needs:
|
||||
- b:macos-arm64-ninja
|
||||
variables:
|
||||
@ -876,8 +851,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:
|
||||
@ -890,8 +863,6 @@ t:macos-arm64-curl:
|
||||
- .cmake_test_macos
|
||||
- .macos_arm64_tags
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:macos-arm64-curl
|
||||
needs:
|
||||
- b:macos-arm64-curl
|
||||
variables:
|
||||
@ -911,8 +882,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
|
||||
|
||||
@ -923,8 +892,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:
|
||||
@ -937,8 +904,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:
|
||||
@ -951,8 +916,6 @@ t:macos-arm64-xcode:
|
||||
- .macos_arm64_tags_ext
|
||||
- .cmake_junit_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- t:macos-arm64-ninja
|
||||
needs:
|
||||
- t:macos-arm64-ninja
|
||||
|
||||
@ -963,8 +926,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:
|
||||
@ -977,8 +938,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:
|
||||
@ -991,8 +950,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:
|
||||
@ -1005,8 +962,6 @@ b:macos-package:
|
||||
- .cmake_release_artifacts
|
||||
- .macos_arm64_tags_package
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- p:doc-package
|
||||
needs:
|
||||
- p:doc-package
|
||||
variables:
|
||||
@ -1016,8 +971,6 @@ u:macos-package:
|
||||
extends:
|
||||
- .rsync_upload_package
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- b:macos-package
|
||||
needs:
|
||||
- b:macos-package
|
||||
|
||||
@ -1028,8 +981,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:
|
||||
@ -1039,8 +990,6 @@ u:macos10.10-package:
|
||||
extends:
|
||||
- .rsync_upload_package
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- b:macos10.10-package
|
||||
needs:
|
||||
- b:macos10.10-package
|
||||
|
||||
@ -1072,8 +1021,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:
|
||||
@ -1087,8 +1034,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:
|
||||
@ -1100,8 +1045,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
|
||||
|
||||
@ -1126,8 +1069,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:
|
||||
@ -1140,8 +1081,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:
|
||||
@ -1154,8 +1093,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:
|
||||
@ -1168,8 +1105,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:
|
||||
@ -1182,8 +1117,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:
|
||||
@ -1196,8 +1129,6 @@ t:windows-clang17.0-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:
|
||||
@ -1211,8 +1142,6 @@ t:windows-clang17.0-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:
|
||||
@ -1226,8 +1155,6 @@ t:windows-clang17.0-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:
|
||||
@ -1241,8 +1168,6 @@ t:windows-clang17.0-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:
|
||||
@ -1256,8 +1181,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:
|
||||
@ -1271,8 +1194,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:
|
||||
@ -1286,8 +1207,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:
|
||||
@ -1300,8 +1219,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:
|
||||
@ -1314,8 +1231,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:
|
||||
@ -1328,8 +1243,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:
|
||||
@ -1342,8 +1255,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:
|
||||
@ -1368,8 +1279,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:
|
||||
@ -1382,8 +1291,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:
|
||||
@ -1398,8 +1305,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:
|
||||
@ -1409,8 +1314,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
|
||||
|
||||
@ -1421,8 +1324,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:
|
||||
@ -1432,8 +1333,6 @@ u:windows-i386-package:
|
||||
extends:
|
||||
- .rsync_upload_package
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- b:windows-i386-package
|
||||
needs:
|
||||
- b:windows-i386-package
|
||||
|
||||
@ -1444,8 +1343,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:
|
||||
@ -1455,7 +1352,5 @@ u:windows-arm64-package:
|
||||
extends:
|
||||
- .rsync_upload_package
|
||||
- .run_only_for_package
|
||||
dependencies:
|
||||
- b:windows-arm64-package
|
||||
needs:
|
||||
- b:windows-arm64-package
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user