diff --git a/.gitignore b/.gitignore index f30103c625fe0..2961fd68fa2e4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,5 @@ rls*.log .cargo-remote.toml *.bin *.iml -scripts/ci/node-template-release/Cargo.lock bin/node-template/Cargo.lock substrate.code-workspace diff --git a/Cargo.lock b/Cargo.lock index e9bc2a99677a2..b8730d2fb867b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2996,6 +2996,8 @@ dependencies = [ "libc", "libgit2-sys", "log", + "openssl-probe", + "openssl-sys", "url", ] @@ -3922,7 +3924,9 @@ checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" dependencies = [ "cc", "libc", + "libssh2-sys", "libz-sys", + "openssl-sys", "pkg-config", ] @@ -4474,6 +4478,20 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "libssh2-sys" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + [[package]] name = "libz-sys" version = "1.1.8" @@ -5361,6 +5379,20 @@ dependencies = [ "try-runtime-cli", ] +[[package]] +name = "node-template-release" +version = "3.0.0" +dependencies = [ + "clap 4.2.5", + "flate2", + "fs_extra", + "git2", + "glob", + "tar", + "tempfile", + "toml 0.7.3", +] + [[package]] name = "node-template-runtime" version = "4.0.0-dev" @@ -5636,6 +5668,18 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "os_str_bytes" version = "6.4.1" @@ -11801,6 +11845,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.6" @@ -13684,6 +13739,15 @@ dependencies = [ "time 0.3.20", ] +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + [[package]] name = "yamux" version = "0.10.2" diff --git a/Cargo.toml b/Cargo.toml index da5e1d532a970..7563a4a643286 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -236,6 +236,7 @@ members = [ "primitives/version/proc-macro", "primitives/wasm-interface", "primitives/weights", + "scripts/ci/node-template-release", "test-utils", "test-utils/client", "test-utils/derive", diff --git a/scripts/ci/deny.toml b/scripts/ci/deny.toml index 91822c831cc19..408a9e55bc40b 100644 --- a/scripts/ci/deny.toml +++ b/scripts/ci/deny.toml @@ -40,6 +40,7 @@ exceptions = [ { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-bench" }, { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-cli" }, { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-inspect" }, + { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-template-release" }, { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-testing" }, { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-authority-discovery" }, { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-basic-authorship" }, diff --git a/scripts/ci/node-template-release/Cargo.toml b/scripts/ci/node-template-release/Cargo.toml index 668e0f3f62a7f..aca8d6e1f81da 100644 --- a/scripts/ci/node-template-release/Cargo.toml +++ b/scripts/ci/node-template-release/Cargo.toml @@ -3,7 +3,7 @@ name = "node-template-release" version = "3.0.0" authors = ["Parity Technologies "] edition = "2021" -license = "GPL-3.0" +license = "GPL-3.0 WITH Classpath-exception-2.0" homepage = "https://substrate.io" publish = false @@ -11,13 +11,11 @@ publish = false targets = ["x86_64-unknown-linux-gnu"] [dependencies] -clap = { version = "4.0.9", features = ["derive"] } +clap = { version = "4.2.5", features = ["derive"] } flate2 = "1.0" -fs_extra = "1" -git2 = "0.8" -glob = "0.2" +fs_extra = "1.3" +git2 = "0.16" +glob = "0.3" tar = "0.4" tempfile = "3" -toml = "0.4" - -[workspace] +toml = "0.7"