diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index aa4fa5a68472197bccf9b8b73688e6356b9f2a61..d66dfbb878d27facc3e6ca0f0002e49278c0fd76 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -8,7 +8,6 @@ stages: - build - test - test_coverage -- doc - manual oc.docker:ci:amd64: @@ -4254,9 +4253,9 @@ oc.unified_coverage: expose_as: Coverage report coverage: '/Coverage: ([^%]+%)/' -oc.install_python_bookworm: +documentation:install_python_bookworm: image: debian:bookworm - stage: doc + stage: test tags: - gcp rules: @@ -4301,7 +4300,7 @@ oc.install_python_bookworm: documentation:odoc: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4385,7 +4384,7 @@ documentation:odoc: documentation:manuals: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4438,7 +4437,7 @@ documentation:manuals: documentation:docgen: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4520,7 +4519,7 @@ documentation:docgen: documentation:build_all: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4570,7 +4569,7 @@ documentation:build_all: documentation:linkcheck: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: test tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 1b19b2be3ccf8a03b4977052de706531c9adb146..c0035c36f4537c769879ef7ad61ecedb04d1a9c2 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -6,7 +6,7 @@ stages: - images - build - test_coverage -- doc +- publishing - prepare_release - manual @@ -410,7 +410,7 @@ docker:merge_manifests: documentation:odoc: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -471,7 +471,7 @@ documentation:odoc: documentation:manuals: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -516,7 +516,7 @@ documentation:manuals: documentation:docgen: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -575,7 +575,7 @@ documentation:docgen: documentation:build_all: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -621,9 +621,9 @@ documentation:build_all: - docs/_build/ expose_as: Documentation - excluding old protocols -publish:documentation: +documentation:publish: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: publishing tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index c2617da9b0ec27aa44088ea30d2ed0eaac2e7615..2b409264891b324fc9387a2a978e1b237aaa4ad9 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -8,7 +8,6 @@ stages: - build - test - test_coverage -- doc - manual oc.docker:ci:amd64: @@ -4253,9 +4252,9 @@ oc.unified_coverage: expose_as: Coverage report coverage: '/Coverage: ([^%]+%)/' -oc.install_python_bookworm: +documentation:install_python_bookworm: image: debian:bookworm - stage: doc + stage: test tags: - gcp rules: @@ -4300,7 +4299,7 @@ oc.install_python_bookworm: documentation:odoc: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4384,7 +4383,7 @@ documentation:odoc: documentation:manuals: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4437,7 +4436,7 @@ documentation:manuals: documentation:docgen: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4519,7 +4518,7 @@ documentation:docgen: documentation:build_all: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -4569,7 +4568,7 @@ documentation:build_all: documentation:linkcheck: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: test tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/schedule_documentation.yml b/.gitlab/ci/pipelines/schedule_documentation.yml index 17de8e37d2b5b90c49b00ccc41ee7ded11b02f04..dde90399b81516f2eaddac9e1f44e430ca9b937d 100644 --- a/.gitlab/ci/pipelines/schedule_documentation.yml +++ b/.gitlab/ci/pipelines/schedule_documentation.yml @@ -5,7 +5,7 @@ stages: - start - images - build -- doc +- publishing oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -97,7 +97,7 @@ oc.build:static-x86_64-linux-binaries: documentation:odoc: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -159,7 +159,7 @@ documentation:odoc: documentation:manuals: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -205,7 +205,7 @@ documentation:manuals: documentation:docgen: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -265,7 +265,7 @@ documentation:docgen: documentation:build_all: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -312,9 +312,9 @@ documentation:build_all: - docs/_build/ expose_as: Documentation - excluding old protocols -publish:documentation: +documentation:publish: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: publishing tags: - gcp rules: diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index f16cdb8e678ec9437ef3042dccb713f623916ada..acefb51730f3833d94f3420b92c815fbdae8ec4b 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -8,7 +8,6 @@ stages: - build - test - packaging -- doc oc.docker:ci:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 @@ -3440,9 +3439,9 @@ tezt:static-binaries: junit: $JUNIT when: always -oc.install_python_noble: +documentation:install_python_noble: image: public.ecr.aws/lts/ubuntu:24.04_stable - stage: doc + stage: test tags: - gcp rules: @@ -3455,9 +3454,9 @@ oc.install_python_noble: script: - ./docs/developer/install-python-debian-ubuntu.sh tezos/tezos master -oc.install_python_jammy: +documentation:install_python_jammy: image: public.ecr.aws/lts/ubuntu:22.04_stable - stage: doc + stage: test tags: - gcp rules: @@ -3470,9 +3469,9 @@ oc.install_python_jammy: script: - ./docs/developer/install-python-debian-ubuntu.sh tezos/tezos master -oc.install_python_bookworm: +documentation:install_python_bookworm: image: debian:bookworm - stage: doc + stage: test tags: - gcp rules: @@ -3487,7 +3486,7 @@ oc.install_python_bookworm: documentation:odoc: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -3530,7 +3529,7 @@ documentation:odoc: documentation:manuals: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -3565,7 +3564,7 @@ documentation:manuals: documentation:docgen: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -3606,7 +3605,7 @@ documentation:docgen: documentation:build_all: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: build tags: - gcp rules: @@ -3638,7 +3637,7 @@ documentation:build_all: documentation:linkcheck: image: ${ci_image_name}/test:${ci_image_tag} - stage: doc + stage: test tags: - gcp rules: diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index da01a1fa794c38560b0c58452667bc742c00d222..68c7f449458ad98dac9950ec7c31c558d48657c5 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -1899,7 +1899,7 @@ let jobs pipeline_type = | Schedule_extended_test -> [] in - (*Doc jobs*) + (* Doc jobs *) let doc = let jobs_install_python = (* Creates a job that tests installation of the python environment in [image] *) @@ -1908,7 +1908,7 @@ let jobs pipeline_type = ~__POS__ ~name ~image - ~stage:Stages.doc + ~stage:Stages.test ~dependencies:dependencies_needs_start ~rules: (make_rules @@ -1937,19 +1937,19 @@ let jobs pipeline_type = [ job_install_python ~__POS__ - ~name:"oc.install_python_noble" + ~name:"documentation:install_python_noble" ~image:Images.ubuntu_noble ~project:"tezos/tezos" ~branch:"master"; job_install_python ~__POS__ - ~name:"oc.install_python_jammy" + ~name:"documentation:install_python_jammy" ~image:Images.ubuntu_jammy ~project:"tezos/tezos" ~branch:"master"; job_install_python ~__POS__ - ~name:"oc.install_python_bookworm" + ~name:"documentation:install_python_bookworm" ~image:Images.debian_bookworm ~project:"tezos/tezos" ~branch:"master"; @@ -1958,7 +1958,7 @@ let jobs pipeline_type = [ job_install_python ~__POS__ - ~name:"oc.install_python_bookworm" + ~name:"documentation:install_python_bookworm" ~image:Images.debian_bookworm ~project:"${CI_MERGE_REQUEST_SOURCE_PROJECT_PATH:-tezos/tezos}" ~branch:"${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-master}"; diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 907158d282373f5017bd7de8665ab315413cf0da..63c2beb8c6a74c32f6a7a59356835f6c7d9c7a69 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -1182,7 +1182,7 @@ module Documentation = struct ~__POS__ ~name:"documentation:odoc" ~image:Images.CI.test - ~stage:Stages.doc + ~stage:Stages.build ?dependencies ?rules ~before_script:(before_script ~eval_opam:true []) @@ -1212,7 +1212,7 @@ module Documentation = struct ~__POS__ ~name:"documentation:manuals" ~image:Images.CI.test - ~stage:Stages.doc + ~stage:Stages.build ?dependencies ?rules ~before_script:(before_script ~eval_opam:true []) @@ -1242,7 +1242,7 @@ module Documentation = struct ~__POS__ ~name:"documentation:docgen" ~image:Images.CI.test - ~stage:Stages.doc + ~stage:Stages.build ?dependencies ?rules ~before_script:(before_script ~eval_opam:true []) @@ -1274,7 +1274,7 @@ module Documentation = struct ~__POS__ ~name:"documentation:build_all" ~image:Images.CI.test - ~stage:Stages.doc + ~stage:Stages.build ~dependencies ?rules ~before_script:(before_script ~eval_opam:true ~init_python_venv:true []) @@ -1298,7 +1298,7 @@ module Documentation = struct ~__POS__ ~name:"documentation:linkcheck" ~image:Images.CI.test - ~stage:Stages.doc + ~stage:Stages.test ~dependencies (* Warning: the [documentation:linkcheck] job must have at least the same restrictions in the rules as [documentation:build_all], otherwise the CI @@ -1324,9 +1324,9 @@ module Documentation = struct let dependencies = mk_artifact_dependencies ?dependencies [job_build_all] in job ~__POS__ - ~name:"publish:documentation" + ~name:"documentation:publish" ~image:Images.CI.test - ~stage:Stages.doc + ~stage:Stages.publishing ~dependencies ~before_script: (before_script diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index c5976b99db6e85bb68b6f549f9c7223ec4ac14f9..d41ed90744cf358bb9c9633bcd1985d2dd1ec8ca 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1295,8 +1295,6 @@ module Stages = struct let publishing_tests = Stage.register "publishing_tests" - let doc = Stage.register "doc" - let scan = Stage.register "scan" let prepare_release = Stage.register "prepare_release" diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index 64b055a780d93044fcbe0a820765095fdfcb65a7..35173a473b29212b104f08c10e6bf525c22c06a8 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -568,8 +568,6 @@ module Stages : sig val publishing_tests : Stage.t - val doc : Stage.t - (* Scanning vulnerabilities of Docker images. *) val scan : Stage.t