From b80eb916ffe104e972f970017a2de3ff20a22810 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Wed, 9 Jul 2025 13:53:28 +0200 Subject: [PATCH 1/6] (temp)CI: dummy change in [master_branch] To check the pipeline that is generated. --- .gitlab/ci/pipelines/master_branch.yml | 2 +- ci/bin/master_branch.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 62aead7d2241..361bacfff7bb 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -299,7 +299,7 @@ datadog_pipeline_trace: - DATADOG_SITE=datadoghq.eu datadog-ci tag --level pipeline --tags pipeline_type:$PIPELINE_TYPE --tags mr_number:$CI_MERGE_REQUEST_IID -oc.unified_coverage: +oc.unified_coverage_dummy_change: image: ${ci_image_name}/test:${ci_image_tag} stage: test_coverage tags: diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index 8e85e52983ef..0ceb9c47dbbd 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -129,7 +129,7 @@ let jobs = job ~__POS__ ~image:Images.CI.test - ~name:"oc.unified_coverage" + ~name:"oc.unified_coverage_dummy_change" ~stage:Stages.test_coverage ~variables: [ -- GitLab From ef0d501e31076299dd0517ec406ed2443baa361b Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 11 Jul 2025 12:20:07 +0200 Subject: [PATCH 2/6] (temp) duplicate jobs_documentation --- ci/bin/master_branch.ml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index 0ceb9c47dbbd..98cedab94095 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -59,6 +59,24 @@ let jobs_documentation : tezos_job list = in [job_odoc; job_manuals; job_docgen; job_build_all; job_publish_documentation] +let jobs_documentation_master : tezos_job list = + let dependencies = Dependent [] in + let job_odoc = Documentation.job_odoc ~dependencies () in + let job_manuals = + Documentation.job_manuals + ~dependencies:(Dependent [Artifacts job_static_x86_64]) + ~use_static_executables:true + () + in + let job_docgen = Documentation.job_docgen ~dependencies () in + let job_build_all = + Documentation.job_build_all ~job_odoc ~job_manuals ~job_docgen () + in + let job_publish_documentation : tezos_job = + Documentation.job_publish_documentation ~job_build_all () + in + [job_odoc; job_manuals; job_docgen; job_build_all; job_publish_documentation] + (* Defines the jobs of the [schedule_docker_build_pipeline] pipeline. This pipeline runs scheduled on the [master] branch. The goal @@ -196,6 +214,6 @@ let jobs = (* Jobs to build and update on Docker Hub the Octez Docker image. *) @ octez_distribution_docker_jobs (* Stage: doc *) - @ jobs_documentation + @ jobs_documentation_master (* Stage: manual *) @ [job_publish_kernel_sdk] -- GitLab From 06484320f38f75bf3bad274901ccb807c0398940 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 11 Jul 2025 12:20:53 +0200 Subject: [PATCH 3/6] (temp) rm [publish:documentation] --- .gitlab/ci/pipelines/master_branch.yml | 39 -------------------------- ci/bin/master_branch.ml | 4 +-- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 361bacfff7bb..0514fa5cb79e 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -545,45 +545,6 @@ documentation:build_all: - docs/_build/ expose_as: Documentation - excluding old protocols -documentation:publish: - image: ${ci_image_name}/test:${ci_image_tag} - stage: publish - tags: - - gcp - needs: - - oc.docker:ci:amd64 - - documentation:build_all - dependencies: - - oc.docker:ci:amd64 - - documentation:build_all - timeout: 60 minutes - cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: sccache-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/_sccache - policy: pull-push - interruptible: false - before_script: - - . ./scripts/ci/datadog_send_job_info.sh - - eval $(opam env) - - . $HOME/.venv/bin/activate - - echo "${CI_PK_GITLAB_DOC}" > ~/.ssh/id_ed25519 - - echo "${CI_KH}" > ~/.ssh/known_hosts - - chmod 400 ~/.ssh/id_ed25519 - - . ./scripts/ci/sccache-start.sh - script: - - ./scripts/ci/doc_publish.sh - after_script: - - ./scripts/ci/sccache-stop.sh - variables: - CARGO_NET_OFFLINE: "false" - SCCACHE_DIR: $CI_PROJECT_DIR/_sccache - SCCACHE_CACHE_SIZE: 5G - publish_kernel_sdk: image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag} stage: manual diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index 98cedab94095..ebae9b6a7719 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -72,10 +72,10 @@ let jobs_documentation_master : tezos_job list = let job_build_all = Documentation.job_build_all ~job_odoc ~job_manuals ~job_docgen () in - let job_publish_documentation : tezos_job = + let _job_publish_documentation : tezos_job = Documentation.job_publish_documentation ~job_build_all () in - [job_odoc; job_manuals; job_docgen; job_build_all; job_publish_documentation] + [job_odoc; job_manuals; job_docgen; job_build_all] (* Defines the jobs of the [schedule_docker_build_pipeline] pipeline. -- GitLab From fafea4555687334b0dc7a32e3d60b7602433b60d Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 11 Jul 2025 12:22:14 +0200 Subject: [PATCH 4/6] (temp)CI: rm all [doc] jobs from [master_branch] --- .gitlab/ci/pipelines/master_branch.yml | 138 ------------------------- ci/bin/master_branch.ml | 4 +- 2 files changed, 2 insertions(+), 140 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 0514fa5cb79e..723ed9dd86c4 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -407,144 +407,6 @@ docker:merge_manifests: DOCKER_VERSION: 24.0.7 CI_DOCKER_HUB: "true" -documentation:odoc: - image: ${ci_image_name}/test:${ci_image_tag} - stage: build - tags: - - gcp - needs: - - oc.docker:ci:amd64 - dependencies: - - oc.docker:ci:amd64 - timeout: 60 minutes - cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: sccache-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/_sccache - policy: pull-push - before_script: - - . ./scripts/ci/datadog_send_job_info.sh - - eval $(opam env) - - . ./scripts/ci/sccache-start.sh - script: - - export OPAMFETCH='wget' - - opam remote add default https://opam.ocaml.org/ - - opam repo add archive git+https://github.com/ocaml/opam-repository-archive - - opam update - - opam install --yes odoc.2.4.4 - - make -C docs odoc - after_script: - - ./scripts/ci/sccache-stop.sh - variables: - CARGO_NET_OFFLINE: "false" - SCCACHE_DIR: $CI_PROJECT_DIR/_sccache - SCCACHE_CACHE_SIZE: 5G - artifacts: - expire_in: 1 hour - paths: - - docs/_build/api/odoc/ - - docs/odoc.log - when: always - -documentation:manuals: - image: ${ci_image_name}/test:${ci_image_tag} - stage: build - tags: - - gcp - needs: - - oc.docker:ci:amd64 - - oc.build:static-x86_64-linux-binaries - dependencies: - - oc.docker:ci:amd64 - - oc.build:static-x86_64-linux-binaries - timeout: 60 minutes - before_script: - - . ./scripts/ci/datadog_send_job_info.sh - - eval $(opam env) - script: - - scripts/ci/documentation:manuals_static.sh - artifacts: - expire_in: 1 week - paths: - - docs/*/octez-*.html - - docs/api/octez-*.txt - - docs/developer/metrics.csv - - docs/developer/rollup_metrics.csv - - docs/user/node-config.json - -documentation:docgen: - image: ${ci_image_name}/test:${ci_image_tag} - stage: build - tags: - - gcp - needs: - - oc.docker:ci:amd64 - dependencies: - - oc.docker:ci:amd64 - timeout: 60 minutes - cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: sccache-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/_sccache - policy: pull-push - before_script: - - . ./scripts/ci/datadog_send_job_info.sh - - eval $(opam env) - - . ./scripts/ci/sccache-start.sh - script: - - make -C docs -j docexes-gen - after_script: - - ./scripts/ci/sccache-stop.sh - variables: - CARGO_NET_OFFLINE: "false" - SCCACHE_DIR: $CI_PROJECT_DIR/_sccache - SCCACHE_CACHE_SIZE: 5G - artifacts: - expire_in: 1 week - paths: - - docs/alpha/rpc.rst - - docs/shell/rpc.rst - - docs/user/default-acl.json - - docs/api/errors.rst - - docs/shell/p2p_api.rst - -documentation:build_all: - image: ${ci_image_name}/test:${ci_image_tag} - stage: build - tags: - - gcp - needs: - - oc.docker:ci:amd64 - - documentation:odoc - - documentation:manuals - - documentation:docgen - dependencies: - - oc.docker:ci:amd64 - - documentation:odoc - - documentation:manuals - - documentation:docgen - timeout: 60 minutes - before_script: - - . ./scripts/ci/datadog_send_job_info.sh - - eval $(opam env) - - . $HOME/.venv/bin/activate - script: - - make -C docs -j sphinx - - make -C docs -j _build/octezdoc.txt - artifacts: - expire_in: 1 week - paths: - - docs/_build/ - expose_as: Documentation - excluding old protocols - publish_kernel_sdk: image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag} stage: manual diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index ebae9b6a7719..ba90011197a7 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -59,7 +59,7 @@ let jobs_documentation : tezos_job list = in [job_odoc; job_manuals; job_docgen; job_build_all; job_publish_documentation] -let jobs_documentation_master : tezos_job list = +let _jobs_documentation_master : tezos_job list = let dependencies = Dependent [] in let job_odoc = Documentation.job_odoc ~dependencies () in let job_manuals = @@ -214,6 +214,6 @@ let jobs = (* Jobs to build and update on Docker Hub the Octez Docker image. *) @ octez_distribution_docker_jobs (* Stage: doc *) - @ jobs_documentation_master + (* @ jobs_documentation_master *) (* Stage: manual *) @ [job_publish_kernel_sdk] -- GitLab From 56bd42d8452e8014814786c2b858e8b27564fb25 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 11 Jul 2025 14:26:11 +0200 Subject: [PATCH 5/6] Revert "(temp)CI: dummy change in [master_branch]" This reverts commit 3caf269c9f3c865ba766fea58b58842ecafc4418. --- .gitlab/ci/pipelines/master_branch.yml | 2 +- ci/bin/master_branch.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 723ed9dd86c4..6a0e2de3d197 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -299,7 +299,7 @@ datadog_pipeline_trace: - DATADOG_SITE=datadoghq.eu datadog-ci tag --level pipeline --tags pipeline_type:$PIPELINE_TYPE --tags mr_number:$CI_MERGE_REQUEST_IID -oc.unified_coverage_dummy_change: +oc.unified_coverage: image: ${ci_image_name}/test:${ci_image_tag} stage: test_coverage tags: diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index ba90011197a7..2242bae58132 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -147,7 +147,7 @@ let jobs = job ~__POS__ ~image:Images.CI.test - ~name:"oc.unified_coverage_dummy_change" + ~name:"oc.unified_coverage" ~stage:Stages.test_coverage ~variables: [ -- GitLab From a79765b34b16297ffe047e92b7c2079d82d33502 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 11 Jul 2025 14:42:10 +0200 Subject: [PATCH 6/6] fixup! (temp)CI: rm all [doc] jobs from [master_branch] --- ci/bin/master_branch.ml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index 2242bae58132..2dbc1d84e1a3 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -59,24 +59,6 @@ let jobs_documentation : tezos_job list = in [job_odoc; job_manuals; job_docgen; job_build_all; job_publish_documentation] -let _jobs_documentation_master : tezos_job list = - let dependencies = Dependent [] in - let job_odoc = Documentation.job_odoc ~dependencies () in - let job_manuals = - Documentation.job_manuals - ~dependencies:(Dependent [Artifacts job_static_x86_64]) - ~use_static_executables:true - () - in - let job_docgen = Documentation.job_docgen ~dependencies () in - let job_build_all = - Documentation.job_build_all ~job_odoc ~job_manuals ~job_docgen () - in - let _job_publish_documentation : tezos_job = - Documentation.job_publish_documentation ~job_build_all () - in - [job_odoc; job_manuals; job_docgen; job_build_all] - (* Defines the jobs of the [schedule_docker_build_pipeline] pipeline. This pipeline runs scheduled on the [master] branch. The goal @@ -213,7 +195,5 @@ let jobs = ] (* Jobs to build and update on Docker Hub the Octez Docker image. *) @ octez_distribution_docker_jobs - (* Stage: doc *) - (* @ jobs_documentation_master *) (* Stage: manual *) @ [job_publish_kernel_sdk] -- GitLab