diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 9f9a4c7dd7ef14f54b5fcf007f31d65229ac45b4..9a649f65dbd25e55714e287b3d68113843357867 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -92,7 +92,8 @@ trigger: tags: - gcp rules: - - if: $CI_MERGE_REQUEST_ASSIGNEES !~ /nomadic-margebot/ + - if: $GITLAB_USER_LOGIN != "nomadic-margebot" && $CI_MERGE_REQUEST_ASSIGNEES !~ + /nomadic-margebot/ && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train" when: manual allow_failure: false - when: always @@ -624,7 +625,9 @@ opam:bls12-381: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -828,7 +831,9 @@ opam:octez-alcotezt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1168,7 +1173,9 @@ opam:octez-crawler: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -1440,7 +1447,9 @@ opam:octez-distributed-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1508,7 +1517,9 @@ opam:octez-distributed-lwt-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1644,7 +1655,9 @@ opam:octez-evm-node-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 1 minute needs: @@ -1712,7 +1725,9 @@ opam:octez-injector: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -1780,7 +1795,9 @@ opam:octez-internal-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1848,7 +1865,9 @@ opam:octez-l2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -1916,7 +1935,9 @@ opam:octez-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -2052,7 +2073,9 @@ opam:octez-node-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -2120,7 +2143,9 @@ opam:octez-proto-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -2188,7 +2213,9 @@ opam:octez-protocol-000-Ps9mPmXa-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2256,7 +2283,9 @@ opam:octez-protocol-001-PtCJ7pwo-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2324,7 +2353,9 @@ opam:octez-protocol-002-PsYLVpVv-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2392,7 +2423,9 @@ opam:octez-protocol-003-PsddFKi3-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2460,7 +2493,9 @@ opam:octez-protocol-004-Pt24m4xi-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2528,7 +2563,9 @@ opam:octez-protocol-005-PsBabyM1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2596,7 +2633,9 @@ opam:octez-protocol-006-PsCARTHA-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2664,7 +2703,9 @@ opam:octez-protocol-007-PsDELPH1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2732,7 +2773,9 @@ opam:octez-protocol-008-PtEdo2Zk-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2800,7 +2843,9 @@ opam:octez-protocol-009-PsFLoren-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2868,7 +2913,9 @@ opam:octez-protocol-010-PtGRANAD-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2936,7 +2983,9 @@ opam:octez-protocol-011-PtHangz2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3004,7 +3053,9 @@ opam:octez-protocol-012-Psithaca-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3072,7 +3123,9 @@ opam:octez-protocol-013-PtJakart-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3140,7 +3193,9 @@ opam:octez-protocol-014-PtKathma-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3208,7 +3263,9 @@ opam:octez-protocol-015-PtLimaPt-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3276,7 +3333,9 @@ opam:octez-protocol-016-PtMumbai-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3344,7 +3403,9 @@ opam:octez-protocol-017-PtNairob-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3412,7 +3473,9 @@ opam:octez-protocol-018-Proxford-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3480,7 +3543,9 @@ opam:octez-protocol-019-PtParisB-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3548,7 +3613,9 @@ opam:octez-protocol-alpha-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3752,7 +3819,9 @@ opam:octez-riscv-api: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -3820,7 +3889,9 @@ opam:octez-riscv-pvm: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -3888,7 +3959,9 @@ opam:octez-rpc-process: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3956,7 +4029,9 @@ opam:octez-rust-deps: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4024,7 +4099,9 @@ opam:octez-shell-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4228,7 +4305,9 @@ opam:octez-smart-rollup-node-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4296,7 +4375,9 @@ opam:octez-smart-rollup-node-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4364,7 +4445,9 @@ opam:octez-smart-rollup-node-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4432,7 +4515,9 @@ opam:octez-smart-rollup-node-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4500,7 +4585,9 @@ opam:octez-smart-rollup-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4636,7 +4723,9 @@ opam:octez-smart-rollup-wasm-debugger-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4704,7 +4793,9 @@ opam:octez-smart-rollup-wasm-debugger-plugin: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4840,7 +4931,9 @@ opam:tezos-benchmark: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4908,7 +5001,9 @@ opam:tezos-client-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -4976,7 +5071,9 @@ opam:tezos-client-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5044,7 +5141,9 @@ opam:tezos-dac-client-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5112,7 +5211,9 @@ opam:tezos-dac-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5180,7 +5281,9 @@ opam:tezos-dac-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -5248,7 +5351,9 @@ opam:tezos-dal-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5316,7 +5421,9 @@ opam:tezos-dal-node-services: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5384,7 +5491,9 @@ opam:tezos-openapi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5452,7 +5561,9 @@ opam:tezos-protocol-000-Ps9mPmXa: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5520,7 +5631,9 @@ opam:tezos-protocol-001-PtCJ7pwo: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5588,7 +5701,9 @@ opam:tezos-protocol-002-PsYLVpVv: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5656,7 +5771,9 @@ opam:tezos-protocol-003-PsddFKi3: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5724,7 +5841,9 @@ opam:tezos-protocol-004-Pt24m4xi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5792,7 +5911,9 @@ opam:tezos-protocol-005-PsBABY5H: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5860,7 +5981,9 @@ opam:tezos-protocol-005-PsBabyM1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5928,7 +6051,9 @@ opam:tezos-protocol-006-PsCARTHA: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -5996,7 +6121,9 @@ opam:tezos-protocol-007-PsDELPH1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6064,7 +6191,9 @@ opam:tezos-protocol-008-PtEdo2Zk: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6132,7 +6261,9 @@ opam:tezos-protocol-008-PtEdoTez: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6200,7 +6331,9 @@ opam:tezos-protocol-009-PsFLoren: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6268,7 +6401,9 @@ opam:tezos-protocol-010-PtGRANAD: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6336,7 +6471,9 @@ opam:tezos-protocol-011-PtHangz2: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6404,7 +6541,9 @@ opam:tezos-protocol-012-Psithaca: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6472,7 +6611,9 @@ opam:tezos-protocol-013-PtJakart: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6540,7 +6681,9 @@ opam:tezos-protocol-014-PtKathma: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6608,7 +6751,9 @@ opam:tezos-protocol-015-PtLimaPt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6676,7 +6821,9 @@ opam:tezos-protocol-016-PtMumbai: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6744,7 +6891,9 @@ opam:tezos-protocol-017-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6812,7 +6961,9 @@ opam:tezos-protocol-018-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6880,7 +7031,9 @@ opam:tezos-protocol-019-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6948,7 +7101,9 @@ opam:tezos-protocol-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7016,7 +7171,9 @@ opam:tezos-protocol-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7084,7 +7241,9 @@ opam:tezos-protocol-demo-noops: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7152,7 +7311,9 @@ opam:tezos-protocol-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7220,7 +7381,9 @@ opam:tezos-proxy-server-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7288,7 +7451,9 @@ opam:tezt-tezos: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -8920,7 +9085,8 @@ oc.unified_coverage: tags: - gcp rules: - - if: $GITLAB_USER_LOGIN == "nomadic-margebot" + - if: $GITLAB_USER_LOGIN == "nomadic-margebot" || $CI_MERGE_REQUEST_ASSIGNEES =~ + /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" when: never - changes: - .gitlab-ci.yml diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index cc55b7996372ff95c4f0087be50aba7a5b2d8e45..3ebd3f5396fc97c516394ea5bacbb5c401f725c8 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -573,7 +573,9 @@ opam:bls12-381: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -777,7 +779,9 @@ opam:octez-alcotezt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1117,7 +1121,9 @@ opam:octez-crawler: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -1389,7 +1395,9 @@ opam:octez-distributed-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1457,7 +1465,9 @@ opam:octez-distributed-lwt-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1593,7 +1603,9 @@ opam:octez-evm-node-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 1 minute needs: @@ -1661,7 +1673,9 @@ opam:octez-injector: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -1729,7 +1743,9 @@ opam:octez-internal-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1797,7 +1813,9 @@ opam:octez-l2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -1865,7 +1883,9 @@ opam:octez-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -2001,7 +2021,9 @@ opam:octez-node-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -2069,7 +2091,9 @@ opam:octez-proto-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -2137,7 +2161,9 @@ opam:octez-protocol-000-Ps9mPmXa-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2205,7 +2231,9 @@ opam:octez-protocol-001-PtCJ7pwo-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2273,7 +2301,9 @@ opam:octez-protocol-002-PsYLVpVv-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2341,7 +2371,9 @@ opam:octez-protocol-003-PsddFKi3-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2409,7 +2441,9 @@ opam:octez-protocol-004-Pt24m4xi-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2477,7 +2511,9 @@ opam:octez-protocol-005-PsBabyM1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2545,7 +2581,9 @@ opam:octez-protocol-006-PsCARTHA-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2613,7 +2651,9 @@ opam:octez-protocol-007-PsDELPH1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2681,7 +2721,9 @@ opam:octez-protocol-008-PtEdo2Zk-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2749,7 +2791,9 @@ opam:octez-protocol-009-PsFLoren-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2817,7 +2861,9 @@ opam:octez-protocol-010-PtGRANAD-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2885,7 +2931,9 @@ opam:octez-protocol-011-PtHangz2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2953,7 +3001,9 @@ opam:octez-protocol-012-Psithaca-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3021,7 +3071,9 @@ opam:octez-protocol-013-PtJakart-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3089,7 +3141,9 @@ opam:octez-protocol-014-PtKathma-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3157,7 +3211,9 @@ opam:octez-protocol-015-PtLimaPt-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3225,7 +3281,9 @@ opam:octez-protocol-016-PtMumbai-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3293,7 +3351,9 @@ opam:octez-protocol-017-PtNairob-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3361,7 +3421,9 @@ opam:octez-protocol-018-Proxford-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3429,7 +3491,9 @@ opam:octez-protocol-019-PtParisB-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3497,7 +3561,9 @@ opam:octez-protocol-alpha-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3701,7 +3767,9 @@ opam:octez-riscv-api: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -3769,7 +3837,9 @@ opam:octez-riscv-pvm: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -3837,7 +3907,9 @@ opam:octez-rpc-process: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3905,7 +3977,9 @@ opam:octez-rust-deps: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -3973,7 +4047,9 @@ opam:octez-shell-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4177,7 +4253,9 @@ opam:octez-smart-rollup-node-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4245,7 +4323,9 @@ opam:octez-smart-rollup-node-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4313,7 +4393,9 @@ opam:octez-smart-rollup-node-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4381,7 +4463,9 @@ opam:octez-smart-rollup-node-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4449,7 +4533,9 @@ opam:octez-smart-rollup-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4585,7 +4671,9 @@ opam:octez-smart-rollup-wasm-debugger-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4653,7 +4741,9 @@ opam:octez-smart-rollup-wasm-debugger-plugin: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4789,7 +4879,9 @@ opam:tezos-benchmark: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4857,7 +4949,9 @@ opam:tezos-client-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -4925,7 +5019,9 @@ opam:tezos-client-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -4993,7 +5089,9 @@ opam:tezos-dac-client-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5061,7 +5159,9 @@ opam:tezos-dac-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5129,7 +5229,9 @@ opam:tezos-dac-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -5197,7 +5299,9 @@ opam:tezos-dal-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5265,7 +5369,9 @@ opam:tezos-dal-node-services: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5333,7 +5439,9 @@ opam:tezos-openapi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5401,7 +5509,9 @@ opam:tezos-protocol-000-Ps9mPmXa: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5469,7 +5579,9 @@ opam:tezos-protocol-001-PtCJ7pwo: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5537,7 +5649,9 @@ opam:tezos-protocol-002-PsYLVpVv: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5605,7 +5719,9 @@ opam:tezos-protocol-003-PsddFKi3: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5673,7 +5789,9 @@ opam:tezos-protocol-004-Pt24m4xi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5741,7 +5859,9 @@ opam:tezos-protocol-005-PsBABY5H: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5809,7 +5929,9 @@ opam:tezos-protocol-005-PsBabyM1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5877,7 +5999,9 @@ opam:tezos-protocol-006-PsCARTHA: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -5945,7 +6069,9 @@ opam:tezos-protocol-007-PsDELPH1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6013,7 +6139,9 @@ opam:tezos-protocol-008-PtEdo2Zk: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6081,7 +6209,9 @@ opam:tezos-protocol-008-PtEdoTez: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6149,7 +6279,9 @@ opam:tezos-protocol-009-PsFLoren: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6217,7 +6349,9 @@ opam:tezos-protocol-010-PtGRANAD: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6285,7 +6419,9 @@ opam:tezos-protocol-011-PtHangz2: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6353,7 +6489,9 @@ opam:tezos-protocol-012-Psithaca: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6421,7 +6559,9 @@ opam:tezos-protocol-013-PtJakart: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6489,7 +6629,9 @@ opam:tezos-protocol-014-PtKathma: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6557,7 +6699,9 @@ opam:tezos-protocol-015-PtLimaPt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6625,7 +6769,9 @@ opam:tezos-protocol-016-PtMumbai: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6693,7 +6839,9 @@ opam:tezos-protocol-017-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6761,7 +6909,9 @@ opam:tezos-protocol-018-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6829,7 +6979,9 @@ opam:tezos-protocol-019-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6897,7 +7049,9 @@ opam:tezos-protocol-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -6965,7 +7119,9 @@ opam:tezos-protocol-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7033,7 +7189,9 @@ opam:tezos-protocol-demo-noops: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7101,7 +7259,9 @@ opam:tezos-protocol-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7169,7 +7329,9 @@ opam:tezos-proxy-server-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7237,7 +7399,9 @@ opam:tezt-tezos: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 21d1d8e1b8a5130716ce7bbf3e35a67d8108a9a4..893b0640b73c18e1ad867632b15e5934a5b814c2 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -54,7 +54,7 @@ type opam_package = { batch_index : int; } -let opam_rules ~only_marge_bot ?batch_index () = +let opam_rules ~only_final_pipeline ?batch_index () = let when_ = match batch_index with | Some batch_index -> Delayed (Minutes batch_index) @@ -65,8 +65,8 @@ let opam_rules ~only_marge_bot ?batch_index () = job_rule ~if_:(Rules.has_mr_label "ci--opam") ~when_ (); job_rule ~if_: - (if only_marge_bot then - If.(Rules.merge_request && Rules.started_by_marge_bot) + (if only_final_pipeline then + If.(Rules.merge_request && Rules.is_final_pipeline) else Rules.merge_request) ~changes:(Changeset.encode changeset_opam_jobs) ~when_ @@ -86,7 +86,7 @@ let job_opam_package ?dependencies {name; group; batch_index} : tezos_job = Therefore, a retry was added. This should be removed once the underlying tests have been fixed. *) ~retry:2 - ~rules:(opam_rules ~only_marge_bot:(group = All) ~batch_index ()) + ~rules:(opam_rules ~only_final_pipeline:(group = All) ~batch_index ()) ~variables: [ (* See [.gitlab-ci.yml] for details on [RUNTEZTALIAS] *) @@ -321,10 +321,10 @@ let jobs pipeline_type = enable the job [On_success] in the [before_merging] pipeline. This is safe, but prefer specifying a [changes] clause if possible. - If [margebot_disable] is set to true (default false), this job is - disabled when marge-bot starts the [before_merging] pipeline. *) + If [final_pipeline_disable] is set to true (default false), this job is + disabled in final [Before_merging] pipelines. *) let make_rules ?label ?changes ?(manual = No) ?(dependent = false) - ?(margebot_disable = false) () = + ?(final_pipeline_disable = false) () = match pipeline_type with | Schedule_extended_test -> (* The scheduled pipeline always runs all jobs unconditionally @@ -333,8 +333,8 @@ let jobs pipeline_type = [job_rule ~when_:(if dependent then On_success else Always) ()] | Before_merging -> ( (* MR labels can be used to force tests to run. *) - (if margebot_disable then - [job_rule ~if_:Rules.started_by_marge_bot ~when_:Never ()] + (if final_pipeline_disable then + [job_rule ~if_:Rules.is_final_pipeline ~when_:Never ()] else []) @ (match label with | Some label -> @@ -398,7 +398,7 @@ let jobs pipeline_type = ~rules: [ job_rule - ~if_:(If.not Rules.assigned_to_marge_bot) + ~if_:(If.not Rules.is_final_pipeline) ~allow_failure:No ~when_:Manual (); @@ -710,7 +710,7 @@ let jobs pipeline_type = ~dependencies:dependencies_needs_start ~before_script:(before_script ~eval_opam:true []) ~artifacts:(artifacts ["_opam-repo-for-release/"]) - ~rules:(opam_rules ~only_marge_bot:false ~batch_index:1 ()) + ~rules:(opam_rules ~only_final_pipeline:false ~batch_index:1 ()) [ "git init _opam-repo-for-release"; "./scripts/opam-prepare-repo.sh dev ./ ./_opam-repo-for-release"; @@ -1605,7 +1605,10 @@ let jobs pipeline_type = ~stage:Stages.test_coverage ~coverage:"/Coverage: ([^%]+%)/" ~rules: - (make_rules ~margebot_disable:true ~changes:changeset_octez ()) + (make_rules + ~final_pipeline_disable:true + ~changes:changeset_octez + ()) ~variables: [ (* This inhibits the Makefile's opam version check, which diff --git a/ci/bin/rules.ml b/ci/bin/rules.ml index 4f9dc2b4fc5fdd0e28956524cfaab0a0421bc266..e14c0589eb5fbcd9c871a91ecea9130d15d329d8 100644 --- a/ci/bin/rules.ml +++ b/ci/bin/rules.ml @@ -8,6 +8,25 @@ open Gitlab_ci open Gitlab_ci.If +(** Types of merge request pipelines. *) +type merge_request_event_type = Detached | Merged_result | Merge_train + +(** Convert a {!pipeline_source} to string. *) +let merge_request_event_type_to_string = function + | Detached -> "detached" + | Merged_result -> "merged_result" + | Merge_train -> "merge_train" + +let merge_request_event_type_eq merge_request_event_type = + Predefined_vars.ci_merge_request_event_type + == str (merge_request_event_type_to_string merge_request_event_type) + +let detached = merge_request_event_type_eq Detached + +let merged_result = merge_request_event_type_eq Merged_result + +let merge_train = merge_request_event_type_eq Merge_train + (** The source of a pipeline. *) type pipeline_source = Schedule | Merge_request_event | Push @@ -46,6 +65,9 @@ let assigned_to_marge_bot = let started_by_marge_bot = Predefined_vars.gitlab_user_login == str "nomadic-margebot" +let is_final_pipeline = + started_by_marge_bot || assigned_to_marge_bot || merge_train + let has_mr_label label = Predefined_vars.ci_merge_request_labels =~ "/(?:^|,)" ^ label ^ "(?:$|,)/" diff --git a/ci/bin/rules.mli b/ci/bin/rules.mli index f1c418764612ddc46bb40f46da7bd9764cf08d46..91c212b1f1f1dbc4bde308fcb1d0a6cbbb951c50 100644 --- a/ci/bin/rules.mli +++ b/ci/bin/rules.mli @@ -22,6 +22,29 @@ val push : If.t (** A rule that is true if [CI_PIPELINE_SOURCE] is [scheduled]. *) val scheduled : If.t +(** A rule that is true if [CI_MERGE_REQUEST_EVENT_TYPE] is [detached]. + + Merge request pipelines are {i detached} when: + - merge result pipelines are disabled in GitLab CI settings; + - merge result pipelines are enabled {i but} the MR has + conflicts with the target branch and cannot be rebased. *) +val detached : If.t + +(** A rule that is true if [CI_MERGE_REQUEST_EVENT_TYPE] is [merged_result]. + + Merge request pipelines are {i merged result} pipelines when: + - merge result pipelines are enabled in GitLab CI settings; {b and} + - MR rebases cleanly on the target branch; {b and} + - the pipeline is not running in a merge train. *) +val merged_result : If.t + +(** A rule that is true if [CI_MERGE_REQUEST_EVENT_TYPE] is [merge_train]. + + Merge request pipelines are {i merge train} pipelines when merge + trains are activated (and thus necessarily merged result + pipelines), and when the pipeline is triggered from a merge train. *) +val merge_train : If.t + (** A rule that is true for scheduled extended test pipelines. Such pipelines have [CI_PIPELINE_SOURCE] set to [scheduled] and @@ -46,11 +69,18 @@ val has_tag_match : string -> If.t (** A rule that is true if the comma-separated list [CI_MERGE_REQUEST_LABELS] contains a given label. *) val has_mr_label : string -> If.t -(** A rule that is true if [CI_MERGE_REQUEST_ASSIGNEES] contains [nomadic-margebot]. *) -val assigned_to_marge_bot : If.t +(** A rule that is true if this is a final pipeline before merging. + + This rule is true if and only if: + - the pipeline is started by marge-bot; or + - the merge request is assigned to marge-bot; or + - the pipeline is in a merge train. + + We require the second case since there are cases where marge-bot + will just trigger an existing pipeline instead of creating one. -(** A rule that is true if [CI_USER_LOGIN] equals [nomadic-margebot]. *) -val started_by_marge_bot : If.t + Use this rule to add or exclude jobs from final pipelines. *) +val is_final_pipeline : If.t (** A rule that is never true. *) val never : If.t