diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 14526299232fc527129e693be8e1ff8d6a01b7d0..7ec335ee317ac0b7db645f5d5b3e26c91dd8860f 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -398,6 +398,10 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -413,6 +417,7 @@ oc.build_arm64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -448,6 +453,10 @@ oc.build_arm64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -465,6 +474,7 @@ oc.build_arm64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -545,6 +555,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -559,6 +573,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: paths: - octez-binaries/$ARCH/* @@ -630,6 +645,10 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -645,6 +664,7 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -726,6 +746,10 @@ oc.build_x86_64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push - key: dune-build-cache-$CI_PIPELINE_ID paths: - $CI_PROJECT_DIR/_dune_cache @@ -749,6 +773,7 @@ oc.build_x86_64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx DUNE_CACHE: enabled DUNE_CACHE_STORAGE_MODE: hardlink diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 26a744142bc9aff9c47c97d41f01f5e3252fbc38..de5e0137add8852c04044dca31548c57ab92cc14 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -92,6 +92,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -106,6 +110,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: paths: - octez-binaries/$ARCH/* @@ -129,6 +134,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -143,6 +152,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: paths: - octez-binaries/$ARCH/* @@ -167,6 +177,10 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -182,6 +196,7 @@ oc.build_arm64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -215,6 +230,10 @@ oc.build_arm64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -232,6 +251,7 @@ oc.build_arm64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 580c1620d69fce0f3fa3c0f246b8612ed58773a8..a9c8f73b4dc77eeb4a5de42f4b25715a1d5ba518 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -397,6 +397,10 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -412,6 +416,7 @@ oc.build_arm64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -447,6 +452,10 @@ oc.build_arm64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -464,6 +473,7 @@ oc.build_arm64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -544,6 +554,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -558,6 +572,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: paths: - octez-binaries/$ARCH/* @@ -629,6 +644,10 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh @@ -644,6 +663,7 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -725,6 +745,10 @@ oc.build_x86_64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push - key: dune-build-cache-$CI_PIPELINE_ID paths: - $CI_PROJECT_DIR/_dune_cache @@ -748,6 +772,7 @@ oc.build_x86_64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx DUNE_CACHE: enabled DUNE_CACHE_STORAGE_MODE: hardlink diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 9fe864cb824f9476cd6d76fdab3332090d35473c..147f84c47869c9e261d539cbd7f47484727368ea 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -85,6 +85,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -99,6 +103,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -123,6 +128,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -137,6 +146,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index dff611b121ce5689a47518d0eede616e3e35737b..a0e0d87d95e7dc0cdd3dcfa791832dffde23b959 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -85,6 +85,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -99,6 +103,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -123,6 +128,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -137,6 +146,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 631c5ab4a8ca7d97a8bde1a0c9094705721bd389..64db2abfd64b57b7993a16bae9c72858d10defcb 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -85,6 +85,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -99,6 +103,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -123,6 +128,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -137,6 +146,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 72161cadbf9e9591670cbc131c9ae3aaad900032..e00e0b5d490bc63c182dc01d65254cc215536770 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -82,6 +82,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -97,6 +101,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -119,6 +124,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -134,6 +143,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index ebe1edf0073ecceab6761c20e9a73853d0c48d90..8c5c242c709d24c2095116e1c5bba59836e0e79f 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -86,6 +86,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -100,6 +104,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -124,6 +129,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -138,6 +147,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 79da0f0833b471463806aaf34b9ae771b7ad5f41..dc35f6d3dd12acb271e53c239385c9e1fb8a04b0 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -86,6 +86,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -100,6 +104,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -124,6 +129,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -138,6 +147,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml index db4e71d35a14a8b80679dbe737439c19c3ac734c..0e28d2b3d5747771e413f1c6925e40a6bdfe4a37 100644 --- a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml @@ -380,6 +380,10 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -396,6 +400,7 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -427,6 +432,10 @@ oc.build_x86_64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -445,6 +454,7 @@ oc.build_x86_64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index d200512223c0f6b5e99ea04e8e2a6c08332f9278..19f5cb1ace2d186854c09f381c34626e70a1cfda 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -293,6 +293,10 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -309,6 +313,7 @@ oc.build_arm64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -341,6 +346,10 @@ oc.build_arm64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -359,6 +368,7 @@ oc.build_arm64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -391,6 +401,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -406,6 +420,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: paths: - octez-binaries/$ARCH/* @@ -429,6 +444,10 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -445,6 +464,7 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -478,6 +498,10 @@ oc.build_x86_64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push - key: dune-build-cache-$CI_PIPELINE_ID paths: - $CI_PROJECT_DIR/_dune_cache @@ -502,6 +526,7 @@ oc.build_x86_64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx DUNE_CACHE: enabled DUNE_CACHE_STORAGE_MODE: hardlink diff --git a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml index db4e71d35a14a8b80679dbe737439c19c3ac734c..0e28d2b3d5747771e413f1c6925e40a6bdfe4a37 100644 --- a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml @@ -380,6 +380,10 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -396,6 +400,7 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -427,6 +432,10 @@ oc.build_x86_64-exp-dev-extra: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push interruptible: false before_script: - ./scripts/ci/take_ownership.sh @@ -445,6 +454,7 @@ oc.build_x86_64-exp-dev-extra: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index ad0ae898753b87b3fe5061dd547d3c08557e5495..9bba7e42b12573c7f2571929b4756f1ddad70e30 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -85,6 +85,10 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -99,6 +103,7 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: @@ -123,6 +128,10 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push + - key: rust-deps-target-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_target + policy: pull-push before_script: - ./scripts/ci/take_ownership.sh - eval $(opam env) @@ -137,6 +146,7 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G + OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/_target artifacts: expire_in: 90 days paths: diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 10c161d31497a56d9251051d73cefa09dd85f33d..ff683c9d90cdfb3c0baed03e8ef8aafad5016fc4 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -285,6 +285,18 @@ let enable_sccache ?key ?error_log ?idle_timeout ?log |> append_before_script [". ./scripts/ci/sccache-start.sh"] |> append_after_script ["./scripts/ci/sccache-stop.sh"] +let enable_octez_rust_deps_target_dir ?key job = + let key = + Option.value + ~default: + ("rust-deps-target-" ^ Gitlab_ci.Predefined_vars.(show ci_job_name_slug)) + key + in + let path = "$CI_PROJECT_DIR/_target" in + job + |> append_variables [("OCTEZ_RUST_DEPS_TARGET_DIR", path)] + |> append_cache (cache ~key [path]) + (** Allow cargo to access the network by setting [CARGO_NET_OFFLINE=false]. This function should only be applied to jobs that have a GitLab CI @@ -939,7 +951,7 @@ let job_build_static_binaries ~__POS__ ~arch @ version_executable) ~artifacts ["./scripts/ci/build_static_binaries.sh"] - |> enable_cargo_cache |> enable_sccache + |> enable_cargo_cache |> enable_sccache |> enable_octez_rust_deps_target_dir (** Type of Docker build jobs. @@ -1205,7 +1217,7 @@ let job_build_dynamic_binaries ?rules ~__POS__ ~arch ?(release = false) ~variables ~artifacts ["./scripts/ci/build_full_unreleased.sh"] - |> enable_cargo_cache |> enable_sccache + |> enable_cargo_cache |> enable_sccache |> enable_octez_rust_deps_target_dir in (* Disable coverage for arm64 *) if arch = Amd64 then enable_coverage_instrumentation job else job