From 78216a096843cc6eac50e438da3d11574a634594 Mon Sep 17 00:00:00 2001 From: Chevdor Date: Wed, 14 Jul 2021 13:03:04 +0200 Subject: [PATCH] Release 0.6.0 srtool-cli@0.6.0 srtool-lib@0.6.0 Generated by cargo-workspaces --- Cargo.lock | 60 ++++++++++++++++++++++++++++---------------- cli/Cargo.toml | 2 +- doc/usage.adoc | 26 ++++++++++++------- doc/usage_build.adoc | 15 ++++++----- justfile | 4 +-- lib/Cargo.toml | 2 +- 6 files changed, 68 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb42d86..d3ba97f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88b6bd5df287567ffdf4ddf4d33060048e1068308e5f62d81c6f9824a045a48" +checksum = "3d20831bd004dda4c7c372c19cdabff369f794a95e955b3f13fe460e3e1ae95f" dependencies = [ "bstr", "doc-comment", @@ -73,9 +73,9 @@ checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" [[package]] name = "cfg-if" @@ -132,10 +132,10 @@ dependencies = [ ] [[package]] -name = "difference" -version = "2.0.0" +name = "difflib" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "doc-comment" @@ -143,6 +143,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + [[package]] name = "env_logger" version = "0.8.4" @@ -168,9 +174,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "heck" @@ -183,9 +189,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -209,14 +215,23 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", "hashbrown", ] +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + [[package]] name = "js-sys" version = "0.3.51" @@ -234,9 +249,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.97" +version = "0.2.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" [[package]] name = "log" @@ -291,11 +306,12 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "predicates" -version = "1.0.8" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +checksum = "c6e46ca79eb4e21e2ec14430340c71250ab69332abf85521c95d3a8bc336aa76" dependencies = [ - "difference", + "difflib", + "itertools", "predicates-core", ] @@ -426,7 +442,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "srtool-cli" -version = "0.5.0" +version = "0.6.0" dependencies = [ "assert_cmd", "clap", @@ -438,7 +454,7 @@ dependencies = [ [[package]] name = "srtool-lib" -version = "0.5.0" +version = "0.6.0" dependencies = [ "log", "ureq", @@ -520,9 +536,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 77e6fe7..c8b9729 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT" name = "srtool-cli" readme = "README.md" repository = "https://github.com/chevdor/srtool-cli" -version = "0.5.0" +version = "0.6.0" [[bin]] bench = false diff --git a/doc/usage.adoc b/doc/usage.adoc index 5ce9190..017b4bd 100644 --- a/doc/usage.adoc +++ b/doc/usage.adoc @@ -1,19 +1,27 @@ -srtool-cli 0.3.0 +srtool-cli 0.6.0 chevdor -This utility allows invoking the srtool with the right parameters and environment variables. See -documentations of each command below +This utility helps starting a container from the srtool Docker image. It passes the right parameters +and environment variables to the container. Learn more about the srtool image here: +https://github.com/paritytech/srtool USAGE: - srtool [FLAGS] + srtool [FLAGS] [OPTIONS] FLAGS: -h, --help Prints help information - -j, --json Whether we output json or something for humans - -n, --no-cache + -j, --json This option is DEPRECATED and has no effect + -n, --no-cache Do not use the local cached tag value -V, --version Prints version information +OPTIONS: + -i, --image Chose an alternative image. Beware to chose an image that is compatible + with the original srtool image. Using a random image, you take the risk + to NOT produce exactly the same deterministic result than srtool + [default: paritytech/srtool] + SUBCOMMANDS: - build Build opts + build Start a new srtool container to build your runtime help Prints this message or the help of the given subcommand(s) - info Info opts - version Version opts + info Provide information about the srtool container and your repo + version Show the versions of the srtool container. Use --version if you want the version + of this executable diff --git a/doc/usage_build.adoc b/doc/usage_build.adoc index 321c8eb..8d73dbf 100644 --- a/doc/usage_build.adoc +++ b/doc/usage_build.adoc @@ -1,16 +1,20 @@ -srtool-build 0.3.0 +srtool-build 0.6.0 chevdor -Build opts +Start a new srtool container to build your runtime USAGE: - srtool build [OPTIONS] --package --runtime-dir [path] + srtool build [FLAGS] [OPTIONS] --package [path] ARGS: By default, srtool will work in the current folder. If your project is located in another location, you can pass it here [default: .] FLAGS: + -a, --app Enable the "app" mode which is a mix of json output and outputing progress + during the build. This flag is recommended for CI. the json output will be + provided as a single line at the end in compact mode -h, --help Prints help information + -j, --json Enable json output, same than the global --json option -V, --version Prints version information OPTIONS: @@ -26,8 +30,7 @@ OPTIONS: if BUILD_OPTS is set [env: DEFAULT_FEATURES=] -p, --package - Provide the runtime such as kusama-runtime, polkadot-runtime, etc... [env: - PACKAGE=polkadot-runtime] + Provide the runtime such as kusama-runtime, polkadot-runtime, etc... [env: PACKAGE=] --profile The default profile to build runtimes is always `release`. You may override the default @@ -35,5 +38,5 @@ OPTIONS: -r, --runtime-dir If your runtime is not in the standard location runtime/ you can pass this - args to help srtool find it [env: RUNTIME_DIR=runtime/polkadot] + args to help srtool find it [env: RUNTIME_DIR=] diff --git a/justfile b/justfile index 96aa2d6..7943136 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,7 @@ VERSION := `toml get cli/Cargo.toml package.version | jq -r` -bump: - cargo workspaces version minor --no-individual-tags +bump level: + cargo workspaces version {{level}} --no-individual-tags usage: cargo run -q -- --help > doc/usage.adoc diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 2593c50..e2e9297 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "srtool-lib" -version = "0.5.0" +version = "0.6.0" authors = ["chevdor "] edition = "2018"