Merge branch 'main' into test_remove_cargo_encoded_rustflags_env

near · Jan 13, 2025 · 1c08f6f · 1c08f6f
2 parents b8f7a66 + 78094af
commit 1c08f6f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-near-build/Cargo.toml b/cargo-near-build/Cargo.toml
@@ -33,9 +33,6 @@ unix_path = { version = "1.0.1", optional = true }
 tempfile = { version = "3.10.1" }
 shell-words = { version = "1.0.0", optional = true }
 wasm-opt = "=0.116.1"
-# bug on https://github.com/brson/wasm-opt-rs/blob/8854bd8a58d7393c7bacd950884aea521ce8e19f/components/wasm-opt-sys/build.rs#L365 
-# for `x86_64-pc-windows-msvc` platform
-cc = "=1.2.1"
 humantime = "2.1.0"
 indenter = "0.3"
 

diff --git a/cargo-near-build/src/cargo_native/target.rs b/cargo-near-build/src/cargo_native/target.rs
@@ -36,7 +36,7 @@ pub fn wasm32_exists() -> bool {
                 .map(|stdout| {
                     stdout
                         .lines()
-                        .any(|target| target.as_ref().map_or(false, |t| t == COMPILATION_TARGET))
+                        .any(|target| target.as_ref().is_ok_and(|t| t == COMPILATION_TARGET))
                 })
                 .is_ok()
         }

diff --git a/cargo-near/src/commands/new/new-project-template/Cargo.template.toml b/cargo-near/src/commands/new/new-project-template/Cargo.template.toml
@@ -15,9 +15,9 @@ crate-type = ["cdylib", "rlib"]
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md 
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.2-rust-1.83.0"
+image = "sourcescan/cargo-near:0.13.2-rust-1.84.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:d4ecd27f78dea4e37ddc44a86c46a920454472c08a0950228629f2edafb24d0d"
+image_digest = "sha256:b41cb89907f92b114da9e2be4e109bff30ab792c22ddcbd2a4cff8e340cb9acb"
 # list of environment variables names, whose values, if set, will be used as external build parameters
 # in a reproducible manner
 # supported by `sourcescan/cargo-near:0.10.1-rust-1.82.0` image or later images