diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 49e3bde4257e4f07f51d11631fb6ea2966f24c13..c1ab4e2254c2321057d5a5b41bb8087bf5b140c1 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -260,19 +260,8 @@ oc.build:static-x86_64-linux-binaries: tags: - gcp rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - data-encoding/**/* - - etherlink/**/* - - irmin/**/* - - michelson_test_scripts/**/* - - resto/**/* - - src/**/* - - tezt/**/* - - tzt_reference_test_suite/**/* - when: on_success + - when: manual + allow_failure: true needs: - oc.docker:ci:amd64 - trigger @@ -9264,19 +9253,8 @@ tezt:static-binaries: tags: - gcp rules: - - changes: - - .gitlab-ci.yml - - .gitlab/**/* - - brassaia/**/* - - data-encoding/**/* - - etherlink/**/* - - irmin/**/* - - michelson_test_scripts/**/* - - resto/**/* - - src/**/* - - tezt/**/* - - tzt_reference_test_suite/**/* - when: on_success + - when: manual + allow_failure: true needs: - oc.docker:ci:amd64 - select_tezts diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 9751c5e93d38168876879f10964bdaffe70f7cc9..aefb1e899a850832f64bcc475c5f5bad08980078 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -617,7 +617,7 @@ let jobs pipeline_type = of pipelines. So we start this job as early as possible, without waiting for sanity_ci. *) ~dependencies:dependencies_needs_start - ~rules:(make_rules ~changes:changeset_octez ()) + ~rules:(make_rules ~manual:Yes ()) () in let build = @@ -1474,7 +1474,7 @@ let jobs pipeline_type = Artifacts job_static_x86_64_experimental; Artifacts job_tezt_fetch_records; ]) - ~rules + ~rules:(make_rules ~dependent:true ~manual:Yes ()) ~before_script:(before_script ["mv octez-binaries/x86_64/octez-* ."]) () in