From 689405cc209284468de7cf8d53182cddc6357b87 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 5 Dec 2025 09:53:30 +0100 Subject: [PATCH 1/3] scripts: remove _target from datadog script --- scripts/ci/datadog_send_job_cache_info.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/ci/datadog_send_job_cache_info.sh b/scripts/ci/datadog_send_job_cache_info.sh index 3aa42308206d..c0e4d46d911b 100755 --- a/scripts/ci/datadog_send_job_cache_info.sh +++ b/scripts/ci/datadog_send_job_cache_info.sh @@ -25,9 +25,6 @@ fi CARGO_CACHE_DIR=$CI_PROJECT_DIR/.cargo/registry/cache DUNE_CACHE_ROOT=$CI_PROJECT_DIR/_dune_cache -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="" @@ -61,9 +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 "$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" if command -v sccache > /dev/null 2>&1 && [ "$SECTION" = "before" ]; then -- GitLab From 9be7dd80d703dd28124b7d860f0d7888d9ddb539 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 5 Dec 2025 09:56:57 +0100 Subject: [PATCH 2/3] ciao: remove cargo _target use --- .gitlab/ci/pipelines/before_merging.yml | 61 ++----------------- .gitlab/ci/pipelines/documentation.daily.yml | 9 +-- .gitlab/ci/pipelines/documentation.update.yml | 9 +-- .gitlab/ci/pipelines/etherlink.daily.yml | 34 +---------- .gitlab/ci/pipelines/master_branch.yml | 27 +------- .gitlab/ci/pipelines/merge_train.yml | 61 ++----------------- .gitlab/ci/pipelines/non_release_tag.yml | 36 ++--------- .gitlab/ci/pipelines/non_release_tag_test.yml | 36 ++--------- .../octez-smart-rollup-node.release.yml | 18 +----- .../octez-smart-rollup-node.test_release.yml | 18 +----- .../ci/pipelines/octez_beta_release_tag.yml | 36 ++--------- .../pipelines/octez_beta_release_tag_test.yml | 36 ++--------- .../pipelines/octez_evm_node_release_tag.yml | 18 +----- .../ci/pipelines/octez_major_release_tag.yml | 36 ++--------- .../octez_major_release_tag_test.yml | 36 ++--------- .../ci/pipelines/octez_minor_release_tag.yml | 18 +----- .../octez_minor_release_tag_test.yml | 18 +----- ...hedule_extended_baker_remote_mode_test.yml | 9 +-- .../schedule_extended_dal_use_baker.yml | 9 +-- .../pipelines/schedule_extended_rpc_test.yml | 9 +-- .../ci/pipelines/schedule_extended_test.yml | 36 ++--------- .../schedule_extended_validation_test.yml | 9 +-- .../schedule_master_test_release.yml | 18 +----- ci/lib_cacio/cacio.ml | 18 ++---- ci/lib_cacio/cacio.mli | 4 -- ci/lib_tezos_ci_jobs/common.ml | 3 +- etherlink/ci/etherlink_ci.ml | 2 - rollup_node/ci/rollup_node_ci.ml | 1 - 28 files changed, 69 insertions(+), 556 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 8ec0c720b11d..bc4c475ecfe8 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -477,14 +477,10 @@ oc.build_arm64-released: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -509,9 +505,6 @@ oc.build_arm64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 @@ -675,14 +668,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -707,9 +696,6 @@ oc.build:static-x86_64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -754,14 +740,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -786,9 +768,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -837,14 +816,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -869,9 +844,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 @@ -3152,10 +3124,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: dune-build-cache-$CI_PIPELINE_ID paths: - $CI_PROJECT_DIR/_dune_cache @@ -3179,9 +3147,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -4397,14 +4362,10 @@ etherlink.build_evm_node_static_arm64: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -4425,9 +4386,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -4459,14 +4417,10 @@ etherlink.build_evm_node_static_x86_64: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -4487,9 +4441,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/documentation.daily.yml b/.gitlab/ci/pipelines/documentation.daily.yml index 5a0f3a8fbc5e..4c88227fe235 100644 --- a/.gitlab/ci/pipelines/documentation.daily.yml +++ b/.gitlab/ci/pipelines/documentation.daily.yml @@ -68,14 +68,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 a5ada43157e4..751a226ebe25 100644 --- a/.gitlab/ci/pipelines/documentation.update.yml +++ b/.gitlab/ci/pipelines/documentation.update.yml @@ -68,14 +68,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 0f22fe0883aa..a95182d4afdb 100644 --- a/.gitlab/ci/pipelines/etherlink.daily.yml +++ b/.gitlab/ci/pipelines/etherlink.daily.yml @@ -125,14 +125,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -157,9 +153,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 @@ -449,10 +442,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: dune-build-cache-$CI_PIPELINE_ID paths: - $CI_PROJECT_DIR/_dune_cache @@ -476,9 +465,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -590,14 +576,10 @@ etherlink.build_evm_node_static_arm64: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -618,9 +600,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -644,14 +623,10 @@ etherlink.build_evm_node_static_x86_64: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -672,9 +647,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 67a6678e53de..d24129edfbc7 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -105,14 +105,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -137,9 +133,6 @@ oc.build:static-x86_64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -157,14 +150,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -189,9 +178,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -210,14 +196,10 @@ oc.build_arm64-released: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -242,9 +224,6 @@ oc.build_arm64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 5501d4441308..d0ba3554f98b 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -476,14 +476,10 @@ oc.build_arm64-released: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -508,9 +504,6 @@ oc.build_arm64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 @@ -674,14 +667,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -706,9 +695,6 @@ oc.build:static-x86_64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -753,14 +739,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -785,9 +767,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -836,14 +815,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -868,9 +843,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 @@ -3086,10 +3058,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: dune-build-cache-$CI_PIPELINE_ID paths: - $CI_PROJECT_DIR/_dune_cache @@ -3113,9 +3081,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -4331,14 +4296,10 @@ etherlink.build_evm_node_static_arm64: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -4359,9 +4320,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -4393,14 +4351,10 @@ etherlink.build_evm_node_static_x86_64: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -4421,9 +4375,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 5e5716884539..bf732cc55cf4 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -1143,14 +1129,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1170,9 +1152,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -1195,14 +1174,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1222,9 +1197,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 0aeb1452b95d..0f2ad0f381c2 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -1143,14 +1129,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1170,9 +1152,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -1195,14 +1174,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1222,9 +1197,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml b/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml index ae241572f788..7980c05191b1 100644 --- a/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml +++ b/.gitlab/ci/pipelines/octez-smart-rollup-node.release.yml @@ -97,14 +97,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -124,9 +120,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -149,14 +142,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -176,9 +165,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY 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 4ac764a8794b..5e78335737f4 100644 --- a/.gitlab/ci/pipelines/octez-smart-rollup-node.test_release.yml +++ b/.gitlab/ci/pipelines/octez-smart-rollup-node.test_release.yml @@ -97,14 +97,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -124,9 +120,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -149,14 +142,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -176,9 +165,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index fd9211b1126c..0134fed6eaa5 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -1145,14 +1131,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1172,9 +1154,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -1197,14 +1176,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1224,9 +1199,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml b/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml index e8cc104a1985..9b190511f494 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag_test.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -1145,14 +1131,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1172,9 +1154,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -1197,14 +1176,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1224,9 +1199,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index e90fcf4f503a..73c355d602eb 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -97,14 +97,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -130,9 +126,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -149,14 +142,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 f804c7c06dbd..91fecf056a73 100644 --- a/.gitlab/ci/pipelines/octez_major_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_major_release_tag.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -1145,14 +1131,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1172,9 +1154,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -1197,14 +1176,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1224,9 +1199,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/octez_major_release_tag_test.yml b/.gitlab/ci/pipelines/octez_major_release_tag_test.yml index a896f95dabc1..71dfc68476f3 100644 --- a/.gitlab/ci/pipelines/octez_major_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_major_release_tag_test.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -1145,14 +1131,10 @@ octez-smart-rollup-node.build:static-arm64-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1172,9 +1154,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY @@ -1197,14 +1176,10 @@ octez-smart-rollup-node.build:static-x86_64-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: true before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -1224,9 +1199,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 CARGO_INCREMENTAL: "0" SCCACHE_GCS_BUCKET: $GCP_SCCACHE_BUCKET SCCACHE_GCS_RW_MODE: READ_ONLY diff --git a/.gitlab/ci/pipelines/octez_minor_release_tag.yml b/.gitlab/ci/pipelines/octez_minor_release_tag.yml index 559de07b0b51..c7849056c78b 100644 --- a/.gitlab/ci/pipelines/octez_minor_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_minor_release_tag.yml @@ -97,14 +97,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -148,14 +141,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -180,9 +169,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 00a6ea48faf7..54c7c418c43e 100644 --- a/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_minor_release_tag_test.yml @@ -97,14 +97,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -148,14 +141,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -180,9 +169,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 d10cad54eefa..4c4f15c3ec75 100644 --- a/.gitlab/ci/pipelines/schedule_extended_baker_remote_mode_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_baker_remote_mode_test.yml @@ -391,14 +391,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -424,9 +420,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/schedule_extended_dal_use_baker.yml b/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml index d10cad54eefa..4c4f15c3ec75 100644 --- a/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml +++ b/.gitlab/ci/pipelines/schedule_extended_dal_use_baker.yml @@ -391,14 +391,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -424,9 +420,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/schedule_extended_rpc_test.yml b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml index d10cad54eefa..4c4f15c3ec75 100644 --- a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml @@ -391,14 +391,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -424,9 +420,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 350133165888..cbeba6113ccf 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -331,14 +331,10 @@ oc.build_arm64-released: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -364,9 +360,6 @@ oc.build_arm64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 @@ -500,14 +493,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -533,9 +522,6 @@ oc.build:static-x86_64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -553,14 +539,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -586,9 +568,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/* @@ -606,14 +585,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -639,9 +614,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/schedule_extended_validation_test.yml b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml index d10cad54eefa..4c4f15c3ec75 100644 --- a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml @@ -391,14 +391,10 @@ oc.build_x86_64-released: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 interruptible: false before_script: - SCRIPT_STEP_BEGIN=$(date +%s) @@ -424,9 +420,6 @@ oc.build_x86_64-released: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 59dc083f2ed3..f558fea93011 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -123,14 +123,10 @@ oc.build:static-x86_64-linux-binaries: - oc.docker:ci:amd64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 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: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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: @@ -174,14 +167,10 @@ oc.build:static-arm64-linux-binaries: - oc.docker:ci:arm64 timeout: 60 minutes cache: - - key: cargo-$CI_JOB_NAME_SLUG + key: cargo-$CI_JOB_NAME_SLUG 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 before_script: - SCRIPT_STEP_BEGIN=$(date +%s) - . ./scripts/ci/datadog_send_job_info.sh @@ -206,9 +195,6 @@ oc.build:static-arm64-linux-binaries: SCCACHE_GCS_KEY_PREFIX: sccache SCCACHE_IGNORE_SERVER_IO_ERROR: "1" SCCACHE_IDLE_TIMEOUT: "0" - 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 ff8cf5e8d700..3bce5b13038e 100644 --- a/ci/lib_cacio/cacio.ml +++ b/ci/lib_cacio/cacio.ml @@ -81,7 +81,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; allow_failure : Gitlab_ci.Types.allow_failure_job option; @@ -400,7 +399,6 @@ let convert_graph ?(interruptible_pipeline = true) script; artifacts; cargo_cache; - cargo_target_caches; sccache; dune_cache; allow_failure; @@ -489,11 +487,6 @@ let convert_graph ?(interruptible_pipeline = true) 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 @@ -540,8 +533,8 @@ let convert_graph ?(interruptible_pipeline = true) ?artifacts ?allow_failure script - |> maybe_enable_cargo_cache |> maybe_enable_cargo_target_caches - |> maybe_enable_sccache |> maybe_enable_dune_cache + |> maybe_enable_cargo_cache |> maybe_enable_sccache + |> maybe_enable_dune_cache in result := UID_map.add uid result_node !result ; result_node @@ -599,7 +592,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 -> ?allow_failure:Gitlab_ci.Types.allow_failure_job -> @@ -806,9 +798,8 @@ 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 - ?allow_failure ?retry ?timeout ?(image_dependencies = []) ?services name - script = + ?(cargo_cache = false) ?sccache ?dune_cache ?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. *) @@ -848,7 +839,6 @@ module Make (Component : COMPONENT) : COMPONENT_API = struct script; artifacts; cargo_cache; - cargo_target_caches; sccache; dune_cache; allow_failure; diff --git a/ci/lib_cacio/cacio.mli b/ci/lib_cacio/cacio.mli index 59443d86a543..d2512db35274 100644 --- a/ci/lib_cacio/cacio.mli +++ b/ci/lib_cacio/cacio.mli @@ -192,9 +192,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}. @@ -227,7 +224,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 -> ?allow_failure:Gitlab_ci.Types.allow_failure_job -> diff --git a/ci/lib_tezos_ci_jobs/common.ml b/ci/lib_tezos_ci_jobs/common.ml index b2b04aee00a0..97ecc55604d8 100644 --- a/ci/lib_tezos_ci_jobs/common.ml +++ b/ci/lib_tezos_ci_jobs/common.ml @@ -120,7 +120,7 @@ module Build = struct @ version_executable) ~artifacts ["./scripts/ci/build_static_binaries.sh"] - |> enable_cargo_cache |> enable_sccache |> enable_cargo_target_caches + |> enable_cargo_cache |> enable_sccache let job_build_released_binaries ?rules ~__POS__ ~arch ?retry ?cpu ?storage ?dependencies () = @@ -159,7 +159,6 @@ module Build = struct ["./scripts/ci/build_full_unreleased.sh"] |> enable_cargo_cache |> enable_sccache ~policy:Pull_push - |> enable_cargo_target_caches let job_build_dynamic_binaries ?(extra = false) ?rules ~__POS__ ~arch ?retry ?cpu ?storage ?dependencies ~name executable_files = diff --git a/etherlink/ci/etherlink_ci.ml b/etherlink/ci/etherlink_ci.ml index 872e498e5f26..47d3f966e81c 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 ()) ~variables: [ @@ -264,7 +263,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 d4578f61808a..78963d67e531 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 ()) - ~cargo_target_caches:true ~artifacts: ((* Extend the lifespan to prevent failure for external tools using artifacts. *) artifacts -- GitLab From fb7359ee65ebc8fbc21df26cbbaea6354d2892be Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Fri, 5 Dec 2025 09:55:48 +0100 Subject: [PATCH 3/3] 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 8d661fc9e4de..a9ac65618e19 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1535,24 +1535,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 3b01dc88291d..667bce71509e 100644 --- a/ci/lib_tezos_ci/tezos_ci.mli +++ b/ci/lib_tezos_ci/tezos_ci.mli @@ -244,13 +244,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