From 03a7bd7752cd192f07555bbbc46c67a987187ca4 Mon Sep 17 00:00:00 2001 From: Alex Pozhylenkov Date: Fri, 31 May 2024 17:51:00 +0300 Subject: [PATCH] fix: Rust build (#255) * try * fix * fix * cleanup --- earthly/rust/Earthfile | 4 ---- earthly/rust/scripts/std_checks.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index b3c1296fb..83b84d639 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -119,10 +119,6 @@ installer: # Set the mount cache env vars DO rust+SET_CACHE_MOUNTS_ENV - # Install the default cargo config, and ensure its in the cached CARGO_HOME as well. - COPY stdcfgs/cargo_config.toml $CARGO_INSTALL_ROOT/config.toml - DO +EXECUTE --cmd="cp $CARGO_INSTALL_ROOT/config.toml $CARGO_HOME/config.toml" - # Universal build scripts we will always need and are not target dependent. COPY --dir scripts /scripts # Copy our common scripts so we can use them inside the container. diff --git a/earthly/rust/scripts/std_checks.py b/earthly/rust/scripts/std_checks.py index 510a8b4c7..4aae3afe6 100755 --- a/earthly/rust/scripts/std_checks.py +++ b/earthly/rust/scripts/std_checks.py @@ -60,7 +60,7 @@ def main(): results.add( vendor_files_check.toml_diff_check( - f"{os.environ.get('CARGO_HOME')}/config.toml", ".cargo/config.toml" + f"/stdcfgs/cargo_config.toml", ".cargo/config.toml" ) ) if rust_toolchain_enabled: