From 7a294ae369ccf0a9da1ddc4f23b3ce637dc3c544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dj8yf0=CE=BCl?= <26653921+dj8yfo@users.noreply.github.com> Date: Tue, 30 Jul 2024 18:41:47 +0300 Subject: [PATCH] chore: update default docker images tags + digests (#191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - **doc: add mention about `git` dependency** - **chore: fix typos** - **chore: update default image tags + digests** --------- Co-authored-by: dj8yf0μl --- README.md | 1 + .../commands/build_command/docker/metadata.rs | 2 +- .../new-project-template/Cargo.toml.template | 4 +- cargo-near/src/util/mod.rs | 2 +- .../docker-build-template/Cargo.lock | 56 ++++++++++--------- .../docker-build-template/Cargo.toml | 6 +- 6 files changed, 38 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index ebb63430..19aeb7bf 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ cargo near Starts interactive mode that will allow to explore all the available commands. --- +Additionally depends on [Git](https://git-scm.com/) binary being installed, besides [cargo](https://github.com/rust-lang/cargo). ```console cargo near new diff --git a/cargo-near/src/commands/build_command/docker/metadata.rs b/cargo-near/src/commands/build_command/docker/metadata.rs index d0aa53f6..4c015757 100644 --- a/cargo-near/src/commands/build_command/docker/metadata.rs +++ b/cargo-near/src/commands/build_command/docker/metadata.rs @@ -41,7 +41,7 @@ impl std::fmt::Display for ReproducibleBuild { writeln!( f, " {}: {}", - "clonable remote of git repository:", + "clonable remote of git repository", self.repository .clone() .map(|url| format!("{}", url)) diff --git a/cargo-near/src/commands/new/new-project-template/Cargo.toml.template b/cargo-near/src/commands/new/new-project-template/Cargo.toml.template index 7fe48d07..cc109d0f 100644 --- a/cargo-near/src/commands/new/new-project-template/Cargo.toml.template +++ b/cargo-near/src/commands/new/new-project-template/Cargo.toml.template @@ -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 = "dj8yfo/sourcescan:0.x.x-dev-git-pull-179-ccache-cut-single" # ERROR: replace with tag in `sourcescan/cargo-near` +image = "sourcescan/cargo-near:git-e3c8adb4b5542cbfc159bb1534f2b94c900c1648-1.80.0" # tag after colon above serves only descriptive purpose; image is identified by digest -image_digest = "sha256:b46ea2c26ef5762c0675aa3563bd38aa045366c27a9918867a2455c83c8b046a" +image_digest = "sha256:4bbcdf985936e1cb9b71c627a00cb9b53546ac0c9ef6b175da2918c1dea21363" # build command inside of docker container # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags, # the command may be any combination of flags of `cargo-near`, diff --git a/cargo-near/src/util/mod.rs b/cargo-near/src/util/mod.rs index d971793a..4d6c231e 100644 --- a/cargo-near/src/util/mod.rs +++ b/cargo-near/src/util/mod.rs @@ -186,7 +186,7 @@ impl std::fmt::Display for VersionMismatch { ) } Self::None => write!(f, "no `cargo-near` version mismatch in nested builds detected",), - Self::UnknownFromDocker => write!(f, "it's unknown if `cargo-near` version mismatch has occured in docker build environment",), + Self::UnknownFromDocker => write!(f, "it's unknown if `cargo-near` version mismatch has occurred in docker build environment",), } } } diff --git a/integration-tests/docker-build-template/Cargo.lock b/integration-tests/docker-build-template/Cargo.lock index 5bb523c3..bde7ab92 100644 --- a/integration-tests/docker-build-template/Cargo.lock +++ b/integration-tests/docker-build-template/Cargo.lock @@ -68,9 +68,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -186,8 +186,9 @@ dependencies = [ [[package]] name = "near-sdk" -version = "5.1.0" -source = "git+https://github.com/near/near-sdk-rs.git?rev=23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528#23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528" +version = "5.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951ac0ba9c90e4ed6e927914d2ecee3d8ae2d74e794656b5ca42a992bd370863" dependencies = [ "base64", "borsh", @@ -205,8 +206,9 @@ dependencies = [ [[package]] name = "near-sdk-macros" -version = "5.1.0" -source = "git+https://github.com/near/near-sdk-rs.git?rev=23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528#23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528" +version = "5.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2d758ff2701e7a53292a9dc2eeede6ed648574456c14f2464bf0a3ba047be3" dependencies = [ "Inflector", "darling", @@ -221,8 +223,9 @@ dependencies = [ [[package]] name = "near-sys" -version = "0.2.1" -source = "git+https://github.com/near/near-sdk-rs.git?rev=23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528#23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf4ca5c805cb78700e10e43484902d8da05f25788db277999d209568aaf4c8e" [[package]] name = "near-token" @@ -304,18 +307,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -324,11 +327,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -354,9 +358,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -377,9 +381,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -392,9 +396,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" [[package]] name = "toml_edit" @@ -415,9 +419,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wee_alloc" diff --git a/integration-tests/docker-build-template/Cargo.toml b/integration-tests/docker-build-template/Cargo.toml index 3154d262..e0a21282 100644 --- a/integration-tests/docker-build-template/Cargo.toml +++ b/integration-tests/docker-build-template/Cargo.toml @@ -13,11 +13,11 @@ crate-type = ["cdylib", "rlib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -near-sdk = { version = "5.1.0", git= "https://github.com/near/near-sdk-rs.git", rev = "23f0545e5d2ca9f0fe2fa12ec6b9b5f00de4b528"} +near-sdk = { version = "5.2.1" } [package.metadata.near.reproducible_build] -image = "dj8yfo/sourcescan:0.x.x-dev-cargo-near-finalization" -image_digest = "sha256:f86a095cb3daed21d0b5f86a4b5d9da0c0e26835f85c42678e1d460c9caa2c12" +image = "sourcescan/cargo-near:git-e3c8adb4b5542cbfc159bb1534f2b94c900c1648-1.80.0" +image_digest = "sha256:4bbcdf985936e1cb9b71c627a00cb9b53546ac0c9ef6b175da2918c1dea21363" container_build_command = ["cargo", "near", "build"] [profile.release]