From c40aff2e93580cc0f3273d3711448c9c2ade2215 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 27 Jun 2025 15:12:02 +0200 Subject: [PATCH] CI: remove changesets in documentation jobs for non-MR pipelines cf. doc https://docs.gitlab.com/ci/yaml/#ruleschanges - [schedule_documentation] is a scheduled pipeline, so `rules: change` always evaluates to `true`, thus `changes` are pointless and can be safely removed - [master_branch] is a branch pipeline so the changes are compared with the previous commit: this is not the desired behaviour and this commit fixes that. --- .gitlab/ci/pipelines/master_branch.yml | 95 ------------------- .../ci/pipelines/schedule_documentation.yml | 95 ------------------- ci/bin/master_branch.ml | 10 +- 3 files changed, 4 insertions(+), 196 deletions(-) diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index e4891fa0caf9..62aead7d2241 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -412,25 +412,6 @@ documentation:odoc: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 dependencies: @@ -474,25 +455,6 @@ documentation:manuals: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 - oc.build:static-x86_64-linux-binaries @@ -519,25 +481,6 @@ documentation:docgen: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 dependencies: @@ -578,25 +521,6 @@ documentation:build_all: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 - documentation:odoc @@ -626,25 +550,6 @@ documentation:publish: stage: publish tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 - documentation:build_all diff --git a/.gitlab/ci/pipelines/schedule_documentation.yml b/.gitlab/ci/pipelines/schedule_documentation.yml index d76ccef03e2b..c8ba514d06d2 100644 --- a/.gitlab/ci/pipelines/schedule_documentation.yml +++ b/.gitlab/ci/pipelines/schedule_documentation.yml @@ -100,25 +100,6 @@ documentation:odoc: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 dependencies: @@ -163,25 +144,6 @@ documentation:manuals: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 - oc.build:static-x86_64-linux-binaries @@ -209,25 +171,6 @@ documentation:docgen: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 dependencies: @@ -269,25 +212,6 @@ documentation:build_all: stage: build tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 - documentation:odoc @@ -318,25 +242,6 @@ documentation:publish: stage: publish tags: - gcp - rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - client-libs/**/* - - data-encoding/**/* - - docs/**/* - - dune - - dune-project - - dune-workspace - - etherlink/**/* - - irmin/**/* - - script-inputs/**/*/ - - scripts/**/*/ - - src/**/* - - tezt/**/* - - vendors/**/* - when: on_success needs: - oc.docker:ci:amd64 - documentation:build_all diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index be246abd65ba..8e85e52983ef 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -42,22 +42,20 @@ let job_static_x86_64 = () let jobs_documentation : tezos_job list = - let rules = [job_rule ~changes:(Changeset.encode changeset_octez_docs) ()] in let dependencies = Dependent [] in - let job_odoc = Documentation.job_odoc ~rules ~dependencies () in + let job_odoc = Documentation.job_odoc ~dependencies () in let job_manuals = Documentation.job_manuals - ~rules ~dependencies:(Dependent [Artifacts job_static_x86_64]) ~use_static_executables:true () in - let job_docgen = Documentation.job_docgen ~rules ~dependencies () in + let job_docgen = Documentation.job_docgen ~dependencies () in let job_build_all = - Documentation.job_build_all ~job_odoc ~job_manuals ~job_docgen ~rules () + Documentation.job_build_all ~job_odoc ~job_manuals ~job_docgen () in let job_publish_documentation : tezos_job = - Documentation.job_publish_documentation ~job_build_all ~rules () + Documentation.job_publish_documentation ~job_build_all () in [job_odoc; job_manuals; job_docgen; job_build_all; job_publish_documentation] -- GitLab