From 723bb2361dbf33872ef1d2196cd6843f94200ac1 Mon Sep 17 00:00:00 2001 From: Rodi-Can Bozman Date: Thu, 4 Dec 2025 11:25:59 +0100 Subject: [PATCH 1/4] Docker: bump foundry-cast to latest nightly build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/foundry-rs/foundry/releases/tag/nightly-efdf0ff81807fa8dc426cbf1316503945aa5544e They bump `svm-rs` version which was causing the duplicate SOLC 0.8.31 version checksum constant on builds. They also renamed the crate to `cast` instead of `foundry-cast` ¯\_(ツ)_/¯. --- images/ci/Dockerfile.e2etest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ci/Dockerfile.e2etest b/images/ci/Dockerfile.e2etest index 434de29df038..c7dc89ae1589 100644 --- a/images/ci/Dockerfile.e2etest +++ b/images/ci/Dockerfile.e2etest @@ -27,10 +27,10 @@ COPY .cargo/config.toml /root/.cargo/ # Foundry releases nightly build. We pick the commit of the day (at the time # of proposing the change) RUN cargo install \ - --git https://github.com/foundry-rs/foundry/ foundry-cast \ + --git https://github.com/foundry-rs/foundry/ cast \ --profile release \ --force --locked \ - --tag nightly-07a1f67114565968b188d1abf42fe2c5c57bfca5 \ + --tag nightly-efdf0ff81807fa8dc426cbf1316503945aa5544e \ && cp /root/.cargo/bin/cast /bin # runtime + end-to-end test dependencies -- GitLab From 751a781e22b742d3ed317dc316fbfc258e2941ce Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 5 Dec 2025 09:53:30 +0100 Subject: [PATCH 2/4] scripts: remove _target from datadog script --- scripts/ci/datadog_send_job_cache_info.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/ci/datadog_send_job_cache_info.sh b/scripts/ci/datadog_send_job_cache_info.sh index 10522189f778..3c1516ff4e5a 100755 --- a/scripts/ci/datadog_send_job_cache_info.sh +++ b/scripts/ci/datadog_send_job_cache_info.sh @@ -25,10 +25,6 @@ fi CARGO_CACHE_DIR=$CI_PROJECT_DIR/.cargo/registry/cache DUNE_CACHE_ROOT=$CI_PROJECT_DIR/_dune_cache -SCCACHE_DIR=$CI_PROJECT_DIR/_sccache -RUST_DEPS_TARGET_DIR=$CI_PROJECT_DIR/.cargo_targets/_target/rust_deps -RUSTZCASH_DEPS_TARGET_DIR=$CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps -ETHERLINK_WASM_RUNTIME_TARGET_DIR=$CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime CACHE_MEASURES="" @@ -62,10 +58,6 @@ get_cache_size() { # Get cache sizes and set environment variables get_cache_size "$DUNE_CACHE_ROOT" "CACHE_DUNE" get_cache_size "$CARGO_CACHE_DIR" "CACHE_CARGO" -get_cache_size "$SCCACHE_DIR" "CACHE_SCCACHE" -get_cache_size "$RUST_DEPS_TARGET_DIR" "CACHE_RUST_DEPS" -get_cache_size "$RUSTZCASH_DEPS_TARGET_DIR" "CACHE_RUSTZCASH_DEPS" -get_cache_size "$ETHERLINK_WASM_RUNTIME_TARGET_DIR" "CACHE_ETHERLINK_WASM_RUNTIME" # Send info to Datadog if command -v datadog-ci > /dev/null 2>&1; then -- GitLab From b155cad0428d2cfbebe4eab91c174fe187e5a5ca Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 5 Dec 2025 09:56:57 +0100 Subject: [PATCH 3/4] ciao: remove cargo _target use --- .gitlab/ci/pipelines/before_merging.yml | 49 ------------------- .gitlab/ci/pipelines/documentation.daily.yml | 7 --- .gitlab/ci/pipelines/documentation.update.yml | 7 --- .gitlab/ci/pipelines/etherlink.daily.yml | 28 ----------- .gitlab/ci/pipelines/master_branch.yml | 21 -------- .gitlab/ci/pipelines/merge_train.yml | 49 ------------------- .gitlab/ci/pipelines/non_release_tag.yml | 28 ----------- .gitlab/ci/pipelines/non_release_tag_test.yml | 28 ----------- .../octez-smart-rollup-node.release.yml | 14 ------ .../octez-smart-rollup-node.test_release.yml | 14 ------ .../ci/pipelines/octez_beta_release_tag.yml | 28 ----------- .../pipelines/octez_beta_release_tag_test.yml | 28 ----------- .../pipelines/octez_evm_node_release_tag.yml | 14 ------ .../ci/pipelines/octez_major_release_tag.yml | 28 ----------- .../octez_major_release_tag_test.yml | 28 ----------- .../ci/pipelines/octez_minor_release_tag.yml | 14 ------ .../octez_minor_release_tag_test.yml | 14 ------ ...hedule_extended_baker_remote_mode_test.yml | 7 --- .../schedule_extended_dal_use_baker.yml | 7 --- .../pipelines/schedule_extended_rpc_test.yml | 7 --- .../ci/pipelines/schedule_extended_test.yml | 28 ----------- .../schedule_extended_validation_test.yml | 7 --- .../schedule_master_test_release.yml | 14 ------ ci/lib_cacio/cacio.ml | 20 ++------ ci/lib_cacio/cacio.mli | 4 -- ci/lib_tezos_ci_jobs/common.ml | 2 - etherlink/ci/etherlink_ci.ml | 2 - rollup_node/ci/rollup_node_ci.ml | 1 - 28 files changed, 5 insertions(+), 493 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index f421da5a2b7b..ed8b4f8fda7e 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -486,10 +486,6 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -510,9 +506,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -686,10 +679,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -710,9 +699,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -765,10 +751,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -789,9 +771,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -856,10 +835,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -880,9 +855,6 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -3275,10 +3247,6 @@ etherlink.build_tezt: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -3306,9 +3274,6 @@ etherlink.build_tezt: - dune cache trim --size=5GB variables: CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G DUNE_CACHE: enabled @@ -4534,10 +4499,6 @@ etherlink.build_evm_node_static_arm64: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -4562,9 +4523,6 @@ etherlink.build_evm_node_static_arm64: EXECUTABLE_FILES: script-inputs/etherlink-experimental-executables VERSION_EXECUTABLE: octez-evm-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -4596,10 +4554,6 @@ etherlink.build_evm_node_static_x86_64: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -4624,9 +4578,6 @@ etherlink.build_evm_node_static_x86_64: EXECUTABLE_FILES: script-inputs/etherlink-experimental-executables VERSION_EXECUTABLE: octez-evm-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/documentation.daily.yml b/.gitlab/ci/pipelines/documentation.daily.yml index 7bbbe0e2dcd3..d89c397981e7 100644 --- a/.gitlab/ci/pipelines/documentation.daily.yml +++ b/.gitlab/ci/pipelines/documentation.daily.yml @@ -76,10 +76,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -100,9 +96,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* diff --git a/.gitlab/ci/pipelines/documentation.update.yml b/.gitlab/ci/pipelines/documentation.update.yml index aa0e1a44c4ba..62e81c59c581 100644 --- a/.gitlab/ci/pipelines/documentation.update.yml +++ b/.gitlab/ci/pipelines/documentation.update.yml @@ -76,10 +76,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -100,9 +96,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* diff --git a/.gitlab/ci/pipelines/etherlink.daily.yml b/.gitlab/ci/pipelines/etherlink.daily.yml index 56f681bca937..f65fcb1eb373 100644 --- a/.gitlab/ci/pipelines/etherlink.daily.yml +++ b/.gitlab/ci/pipelines/etherlink.daily.yml @@ -133,10 +133,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -157,9 +153,6 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -457,10 +450,6 @@ etherlink.build_tezt: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -488,9 +477,6 @@ etherlink.build_tezt: - dune cache trim --size=5GB variables: CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G DUNE_CACHE: enabled @@ -602,10 +588,6 @@ etherlink.build_evm_node_static_arm64: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -630,9 +612,6 @@ etherlink.build_evm_node_static_arm64: EXECUTABLE_FILES: script-inputs/etherlink-experimental-executables VERSION_EXECUTABLE: octez-evm-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -656,10 +635,6 @@ etherlink.build_evm_node_static_x86_64: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -684,9 +659,6 @@ etherlink.build_evm_node_static_x86_64: EXECUTABLE_FILES: script-inputs/etherlink-experimental-executables VERSION_EXECUTABLE: octez-evm-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 77d96b341ba3..8b68cff8c0b1 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -114,10 +114,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -138,9 +134,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -166,10 +159,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -190,9 +179,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -219,10 +205,6 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -243,9 +225,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime 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 dd099cc9ca36..8af8d3826008 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -485,10 +485,6 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -509,9 +505,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -685,10 +678,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -709,9 +698,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -764,10 +750,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -788,9 +770,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -855,10 +834,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -879,9 +854,6 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG @@ -3209,10 +3181,6 @@ etherlink.build_tezt: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -3240,9 +3208,6 @@ etherlink.build_tezt: - dune cache trim --size=5GB variables: CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 5G DUNE_CACHE: enabled @@ -4468,10 +4433,6 @@ etherlink.build_evm_node_static_arm64: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -4496,9 +4457,6 @@ etherlink.build_evm_node_static_arm64: EXECUTABLE_FILES: script-inputs/etherlink-experimental-executables VERSION_EXECUTABLE: octez-evm-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -4530,10 +4488,6 @@ etherlink.build_evm_node_static_x86_64: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -4558,9 +4512,6 @@ etherlink.build_evm_node_static_x86_64: EXECUTABLE_FILES: script-inputs/etherlink-experimental-executables VERSION_EXECUTABLE: octez-evm-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index a78c9a3dd9cc..a449f02ac347 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -1159,10 +1145,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1186,9 +1168,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -1211,10 +1190,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1238,9 +1213,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 4352a450d193..f5a125223865 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -1159,10 +1145,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1186,9 +1168,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -1211,10 +1190,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1238,9 +1213,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml b/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml index 5c93afd250d2..a91b07b21ed4 100644 --- a/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml +++ b/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml @@ -101,10 +101,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -128,9 +124,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -153,10 +146,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -180,9 +169,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez-smart-rollup-node.test_release.yml b/.gitlab/ci/pipelines/octez-smart-rollup-node.test_release.yml index 054a741d48d0..f83b3a14b542 100644 --- a/.gitlab/ci/pipelines/octez-smart-rollup-node.test_release.yml +++ b/.gitlab/ci/pipelines/octez-smart-rollup-node.test_release.yml @@ -101,10 +101,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -128,9 +124,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -153,10 +146,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -180,9 +169,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 2f96cdbb342f..1970c9353b34 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -1161,10 +1147,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1188,9 +1170,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -1213,10 +1192,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1240,9 +1215,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml b/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml index ca14e4b490bd..63918f9f4ada 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -1161,10 +1147,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1188,9 +1170,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -1213,10 +1192,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1240,9 +1215,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 79f7ac8d3ae7..fc6d91c29e2a 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -105,10 +105,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -130,9 +126,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -157,10 +150,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -182,9 +171,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/octez_major_release_tag.yml b/.gitlab/ci/pipelines/octez_major_release_tag.yml index e9fdec684f44..eff3440dff7f 100644 --- a/.gitlab/ci/pipelines/octez_major_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_major_release_tag.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -1161,10 +1147,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1188,9 +1170,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -1213,10 +1192,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1240,9 +1215,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez_major_release_tag_test.yml b/.gitlab/ci/pipelines/octez_major_release_tag_test.yml index 158179f79bf3..3eeb12ba9551 100644 --- a/.gitlab/ci/pipelines/octez_major_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_major_release_tag_test.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -1161,10 +1147,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1188,9 +1170,6 @@ octez-smart-rollup-node.build:static-arm64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: @@ -1213,10 +1192,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: paths: - $CI_PROJECT_DIR/.cargo/registry/cache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push - key: sccache-$CI_JOB_NAME_SLUG paths: - $CI_PROJECT_DIR/_sccache @@ -1240,9 +1215,6 @@ octez-smart-rollup-node.build:static-x86_64-binaries: EXECUTABLE_FILES: script-inputs/smart-rollup-node-executable VERSION_EXECUTABLE: octez-smart-rollup-node CARGO_NET_OFFLINE: "false" - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G artifacts: diff --git a/.gitlab/ci/pipelines/octez_minor_release_tag.yml b/.gitlab/ci/pipelines/octez_minor_release_tag.yml index d00aac8c4d1b..f30a347feec2 100644 --- a/.gitlab/ci/pipelines/octez_minor_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_minor_release_tag.yml @@ -105,10 +105,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -129,9 +125,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -156,10 +149,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -180,9 +169,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml b/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml index 458f51191030..0993b83b29eb 100644 --- a/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml @@ -105,10 +105,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -129,9 +125,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -156,10 +149,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -180,9 +169,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: diff --git a/.gitlab/ci/pipelines/schedule_extended_baker_remote_mode_test.yml b/.gitlab/ci/pipelines/schedule_extended_baker_remote_mode_test.yml index 4e2747a4d76e..18531f867ce1 100644 --- a/.gitlab/ci/pipelines/schedule_extended_baker_remote_mode_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_baker_remote_mode_test.yml @@ -414,10 +414,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -439,9 +435,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG diff --git a/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml b/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml index 4e2747a4d76e..18531f867ce1 100644 --- a/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml +++ b/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml @@ -414,10 +414,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -439,9 +435,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG diff --git a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml index 4e2747a4d76e..18531f867ce1 100644 --- a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml @@ -414,10 +414,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -439,9 +435,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime 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 813c3981d971..450de5455d06 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -339,10 +339,6 @@ oc.build_arm64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -364,9 +360,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG expire_in: 1 day @@ -510,10 +503,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -535,9 +524,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -563,10 +549,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -588,9 +570,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: paths: - octez-binaries/$ARCH/* @@ -616,10 +595,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -641,9 +616,6 @@ oc.build_x86_64-released: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime COVERAGE_OPTIONS: --instrument-with bisect_ppx artifacts: name: build-$ARCH-$CI_COMMIT_REF_SLUG diff --git a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml index 4e2747a4d76e..18531f867ce1 100644 --- a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml @@ -414,10 +414,6 @@ oc.build_x86_64-released: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -439,9 +435,6 @@ 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/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime 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 8d63c17b2171..9f60e94bcb35 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -131,10 +131,6 @@ oc.build:static-x86_64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -155,9 +151,6 @@ oc.build:static-x86_64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: @@ -182,10 +175,6 @@ oc.build:static-arm64-linux-binaries: paths: - $CI_PROJECT_DIR/_sccache policy: pull-push - - key: rust-targets-$CI_JOB_NAME_SLUG - paths: - - $CI_PROJECT_DIR/.cargo_targets/_target - policy: pull-push before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: CARGO_NET_OFFLINE: "false" SCCACHE_DIR: $CI_PROJECT_DIR/_sccache SCCACHE_CACHE_SIZE: 2G - OCTEZ_RUST_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rust_deps - OCTEZ_RUSTZCASH_DEPS_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/rustzcash_deps - OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR: $CI_PROJECT_DIR/.cargo_targets/_target/etherlink_wasm_runtime artifacts: expire_in: 90 days paths: diff --git a/ci/lib_cacio/cacio.ml b/ci/lib_cacio/cacio.ml index d7691cacaddf..cf9fbaa77385 100644 --- a/ci/lib_cacio/cacio.ml +++ b/ci/lib_cacio/cacio.ml @@ -89,7 +89,6 @@ type job = { script : string list; artifacts : Gitlab_ci.Types.artifacts option; cargo_cache : bool; - cargo_target_caches : bool; sccache : sccache_config option; dune_cache : dune_cache_config option; test_coverage : bool; @@ -406,7 +405,6 @@ let convert_graph ?(interruptible_pipeline = true) ~with_condition script; artifacts; cargo_cache; - cargo_target_caches; sccache; dune_cache; test_coverage; @@ -494,11 +492,6 @@ let convert_graph ?(interruptible_pipeline = true) ~with_condition if cargo_cache then Tezos_ci.Cache.enable_cargo_cache job else job in - let maybe_enable_cargo_target_caches job = - if cargo_target_caches then - Tezos_ci.Cache.enable_cargo_target_caches job - else job - in let maybe_enable_sccache job = match sccache with | None -> job @@ -558,9 +551,8 @@ let convert_graph ?(interruptible_pipeline = true) ~with_condition ?artifacts ?allow_failure script - |> maybe_enable_cargo_cache |> maybe_enable_cargo_target_caches - |> maybe_enable_sccache |> maybe_enable_dune_cache - |> maybe_enable_test_coverage + |> maybe_enable_cargo_cache |> maybe_enable_sccache + |> maybe_enable_dune_cache |> maybe_enable_test_coverage in result := UID_map.add uid result_node !result ; result_node @@ -615,7 +607,6 @@ module type COMPONENT_API = sig ?variables:Gitlab_ci.Types.variables -> ?artifacts:Gitlab_ci.Types.artifacts -> ?cargo_cache:bool -> - ?cargo_target_caches:bool -> ?sccache:sccache_config -> ?dune_cache:dune_cache_config -> ?test_coverage:bool -> @@ -823,9 +814,9 @@ module Make (Component : COMPONENT) : COMPONENT_API = struct let job ~__POS__:source_location ~stage ~description ?provider ?arch ?cpu ?storage ~image ?only_if_changed ?(force_if_label = []) ?(needs = []) ?(needs_legacy = []) ?parallel ?variables ?artifacts - ?(cargo_cache = false) ?(cargo_target_caches = false) ?sccache ?dune_cache - ?(test_coverage = false) ?allow_failure ?retry ?timeout - ?(image_dependencies = []) ?services name script = + ?(cargo_cache = false) ?sccache ?dune_cache ?(test_coverage = false) + ?allow_failure ?retry ?timeout ?(image_dependencies = []) ?services name + script = incr number_of_declared_jobs ; let name = make_name name in (* Check that no dependency is in an ulterior stage. *) @@ -865,7 +856,6 @@ module Make (Component : COMPONENT) : COMPONENT_API = struct script; artifacts; cargo_cache; - cargo_target_caches; sccache; dune_cache; test_coverage; diff --git a/ci/lib_cacio/cacio.mli b/ci/lib_cacio/cacio.mli index 7465385ef42a..03e3276cec7c 100644 --- a/ci/lib_cacio/cacio.mli +++ b/ci/lib_cacio/cacio.mli @@ -200,9 +200,6 @@ module type COMPONENT_API = sig If [cargo_cache] is [true], the resulting job is modified with {!Tezos_ci.Cache.enable_cargo_cache}. Default is [false]. - If [cargo_target_caches] is [true], the resulting job is modified with - {!Tezos_ci.Cache.enable_cargo_target_caches}. Default is [false]. - If [sccache] is specified, the resulting job is modified with {!Tezos_ci.Cache.enable_sccache}. @@ -239,7 +236,6 @@ module type COMPONENT_API = sig ?variables:Gitlab_ci.Types.variables -> ?artifacts:Gitlab_ci.Types.artifacts -> ?cargo_cache:bool -> - ?cargo_target_caches:bool -> ?sccache:sccache_config -> ?dune_cache:dune_cache_config -> ?test_coverage:bool -> diff --git a/ci/lib_tezos_ci_jobs/common.ml b/ci/lib_tezos_ci_jobs/common.ml index 802298f8c7ae..5beaaa83f64f 100644 --- a/ci/lib_tezos_ci_jobs/common.ml +++ b/ci/lib_tezos_ci_jobs/common.ml @@ -122,7 +122,6 @@ module Build = struct ["./scripts/ci/build_static_binaries.sh"] |> enable_cargo_cache |> enable_sccache ~cache_size:"2G" - |> enable_cargo_target_caches let job_build_released_binaries ?rules ~__POS__ ~arch ?retry ?cpu ?storage ?dependencies ?(sccache_size = "5G") () = @@ -162,7 +161,6 @@ module Build = struct ["./scripts/ci/build_full_unreleased.sh"] |> enable_cargo_cache |> enable_sccache ~cache_size:sccache_size - |> enable_cargo_target_caches in (* Disable coverage for arm64 *) if arch = Amd64 then Coverage.enable_instrumentation job else job diff --git a/etherlink/ci/etherlink_ci.ml b/etherlink/ci/etherlink_ci.ml index edbd3e958547..e29fdbfed8bd 100644 --- a/etherlink/ci/etherlink_ci.ml +++ b/etherlink/ci/etherlink_ci.ml @@ -87,7 +87,6 @@ let job_build_evm_node_static = ~when_:On_success ["octez-binaries/$ARCH/*"]) ~cargo_cache:true - ~cargo_target_caches:true ~sccache:(Cacio.sccache ~cache_size:"2G" ()) ~variables: [ @@ -269,7 +268,6 @@ let job_build_tezt = ()) ~cargo_cache:true ~sccache:(Cacio.sccache ()) - ~cargo_target_caches:true [ "./scripts/ci/take_ownership.sh"; ". ./scripts/version.sh"; diff --git a/rollup_node/ci/rollup_node_ci.ml b/rollup_node/ci/rollup_node_ci.ml index 8d493f1a06b3..c76817e1c4c2 100644 --- a/rollup_node/ci/rollup_node_ci.ml +++ b/rollup_node/ci/rollup_node_ci.ml @@ -67,7 +67,6 @@ let job_build_static_binaries = ] ~cargo_cache:true ~sccache:(Cacio.sccache ~cache_size:"2G" ()) - ~cargo_target_caches:true ~artifacts: ((* Extend the lifespan to prevent failure for external tools using artifacts. *) artifacts -- GitLab From 77bcbac7f0b45b02eb99783034f575b9747c6c0b Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 5 Dec 2025 09:55:48 +0100 Subject: [PATCH 4/4] ciao: remove cargo _targets defintion --- ci/lib_tezos_ci/tezos_ci.ml | 18 ------------------ ci/lib_tezos_ci/tezos_ci.mli | 7 ------- 2 files changed, 25 deletions(-) diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index aa1f31966735..42895e3b64a4 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1495,24 +1495,6 @@ module Cache = struct [cargo_home // "registry/cache"]) (* Allow Cargo to access the network *) |> enable_networked_cargo - - let enable_cargo_target_caches ?key job = - let key = - Option.value - ~default: - ("rust-targets-" ^ Gitlab_ci.Predefined_vars.(show ci_job_name_slug)) - key - in - let cache_dir = "$CI_PROJECT_DIR/.cargo_targets" // "_target" in - job - |> append_variables - [ - ("OCTEZ_RUST_DEPS_TARGET_DIR", cache_dir // "rust_deps"); - ("OCTEZ_RUSTZCASH_DEPS_TARGET_DIR", cache_dir // "rustzcash_deps"); - ( "OCTEZ_ETHERLINK_WASM_RUNTIME_TARGET_DIR", - cache_dir // "etherlink_wasm_runtime" ); - ] - |> append_cache (cache ~key [cache_dir]) end (** A set of internally and externally built images. diff --git a/ci/lib_tezos_ci/tezos_ci.mli b/ci/lib_tezos_ci/tezos_ci.mli index 82ddd4633222..3941b7b9722f 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -259,13 +259,6 @@ module Cache : sig More precisely, we only cache the non-SCM dependencies in the sub-directory [registry/cache]. *) val enable_cargo_cache : tezos_job -> tezos_job - - (** Enable caching of Cargo's target folder which stores files which - can speed up subsequent compilation passes. - - All folders are stored in a single cacheable directory to work - around GitLab's restriction on the number caches a job may have. *) - val enable_cargo_target_caches : ?key:string -> tezos_job -> tezos_job end (** A facility for registering images for [image:] keywords. -- GitLab