diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index a01cd0cd231f3f347709707d9d1211065fe92ddc..010e7f6a282d01735a83ae597b557af67b28f50a 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -2507,15 +2507,7 @@ ocaml-check: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: sccache-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/_sccache - policy: pull-push - - key: dune_cache-$CI_JOB_NAME_SLUG + key: dune_cache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_dune_cache policy: pull-push @@ -2524,17 +2516,12 @@ ocaml-check: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) - - . ./scripts/ci/sccache-start.sh script: - dune build @check --stop-on-first-error after_script: - - ./scripts/ci/sccache-stop.sh - eval $(opam env) - - dune cache trim --size=5GB + - dune cache trim --size=3GB variables: - CARGO_NET_OFFLINE: "false" - SCCACHE_DIR: $CI_PROJECT_DIR/_sccache - SCCACHE_CACHE_SIZE: 5G DUNE_CACHE: enabled DUNE_CACHE_STORAGE_MODE: hardlink DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index f0939aecabf256181853512b65c8b2521799999a..3fcf9f2dd7477f26e86ffa33eb273b6f6bdc3473 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -2506,15 +2506,7 @@ ocaml-check: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: sccache-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/_sccache - policy: pull-push - - key: dune_cache-$CI_JOB_NAME_SLUG + key: dune_cache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_dune_cache policy: pull-push @@ -2523,17 +2515,12 @@ ocaml-check: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) - - . ./scripts/ci/sccache-start.sh script: - dune build @check --stop-on-first-error after_script: - - ./scripts/ci/sccache-stop.sh - eval $(opam env) - - dune cache trim --size=5GB + - dune cache trim --size=3GB variables: - CARGO_NET_OFFLINE: "false" - SCCACHE_DIR: $CI_PROJECT_DIR/_sccache - SCCACHE_CACHE_SIZE: 5G DUNE_CACHE: enabled DUNE_CACHE_STORAGE_MODE: hardlink DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 3363be2668b26d2bb582068735594069d822d0f5..7e37368397264985141855591c7fb5f60cc1f367 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -2496,15 +2496,7 @@ ocaml-check: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo/registry/cache - policy: pull-push - - key: sccache-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/_sccache - policy: pull-push - - key: dune_cache-$CI_JOB_NAME_SLUG + key: dune_cache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_dune_cache policy: pull-push @@ -2514,17 +2506,12 @@ ocaml-check: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) - - . ./scripts/ci/sccache-start.sh script: - dune build @check --stop-on-first-error after_script: - - ./scripts/ci/sccache-stop.sh - eval $(opam env) - - dune cache trim --size=5GB + - dune cache trim --size=3GB variables: - CARGO_NET_OFFLINE: "false" - SCCACHE_DIR: $CI_PROJECT_DIR/_sccache - SCCACHE_CACHE_SIZE: 5G DUNE_CACHE: enabled DUNE_CACHE_STORAGE_MODE: hardlink DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index f504082fbac312e668c216726c7d6113e4767e47..9503fd2a43e43d7348bd47cdd4556c5c1f64f283 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -933,7 +933,7 @@ let jobs pipeline_type = the log and to reduce time to merge of other MRs further down the merge train. *) ["dune build @check --stop-on-first-error"] - |> enable_cargo_cache |> enable_sccache |> enable_dune_cache + |> enable_dune_cache ~cache_size:"3GB" in (* This job triggers the debian child pipeline automatically if any files in the changeset is modified. It's the same as