diff --git a/.github/workflows/manual-acala.yml b/.github/workflows/manual-acala.yml index 8ddcd23..31aa769 100644 --- a/.github/workflows/manual-acala.yml +++ b/.github/workflows/manual-acala.yml @@ -1,14 +1,14 @@ name: Manual Build - Acala env: - SUBWASM_VERSION: 0.14.1 + SUBWASM_VERSION: 0.15.0 on: workflow_dispatch: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.53.0 + default: 1.56.1 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-bridges.yml b/.github/workflows/manual-bridges.yml index 4ad1e20..49fc323 100644 --- a/.github/workflows/manual-bridges.yml +++ b/.github/workflows/manual-bridges.yml @@ -1,14 +1,14 @@ name: Manual Build - Bridges env: - SUBWASM_VERSION: 0.14.1 + SUBWASM_VERSION: 0.15.0 on: workflow_dispatch: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.53.0 + default: 1.56.1 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-cumulus.yml b/.github/workflows/manual-cumulus.yml index 214e301..3588b0a 100644 --- a/.github/workflows/manual-cumulus.yml +++ b/.github/workflows/manual-cumulus.yml @@ -1,14 +1,14 @@ name: Manual Build - Cumulus env: - SUBWASM_VERSION: 0.14.1 + SUBWASM_VERSION: 0.15.0 on: workflow_dispatch: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.53.0 + default: 1.56.1 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-moonbeam.yml b/.github/workflows/manual-moonbeam.yml index b191dff..b49c39c 100644 --- a/.github/workflows/manual-moonbeam.yml +++ b/.github/workflows/manual-moonbeam.yml @@ -1,14 +1,14 @@ name: Manual Build - Moonbeam env: - SUBWASM_VERSION: 0.14.1 + SUBWASM_VERSION: 0.15.0 on: workflow_dispatch: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.53.0 + default: 1.56.1 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-polkadot.yml b/.github/workflows/manual-polkadot.yml index ae5b690..1b42a1b 100644 --- a/.github/workflows/manual-polkadot.yml +++ b/.github/workflows/manual-polkadot.yml @@ -1,14 +1,14 @@ name: Manual Build - Polkadot env: - SUBWASM_VERSION: 0.14.1 + SUBWASM_VERSION: 0.15.0 on: workflow_dispatch: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.53.0 + default: 1.56.1 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-shiden.yml b/.github/workflows/manual-shiden.yml index 689b51e..f73eb59 100644 --- a/.github/workflows/manual-shiden.yml +++ b/.github/workflows/manual-shiden.yml @@ -1,7 +1,7 @@ name: Manual Build - Shiden env: - SUBWASM_VERSION: 0.14.1 + SUBWASM_VERSION: 0.15.0 REF_FOR_SCHEDULE: development/shiden on: @@ -9,7 +9,7 @@ on: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.53.0 + default: 1.56.1 required: false ref: description: The ref to be used for the repo diff --git a/Dockerfile b/Dockerfile index 0fb26bd..7728510 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM docker.io/library/ubuntu:20.04 LABEL maintainer "chevdor@gmail.com" LABEL description="This image contains tools for Substrate blockchains runtimes." -ARG RUSTC_VERSION="1.53.0" +ARG RUSTC_VERSION="1.56.1" ENV RUSTC_VERSION=$RUSTC_VERSION ENV DOCKER_IMAGE="paritytech/srtool" ENV PROFILE=release @@ -16,7 +16,7 @@ ENV CARGO_HOME="/cargo-home" ENV DEBIAN_FRONTEND=noninteractive # Tooling -ARG SUBWASM_VERSION=0.14.1 +ARG SUBWASM_VERSION=0.15.0 ARG TERA_CLI_VERSION=0.2.0 ARG TOML_CLI_VERSION=0.2.1 diff --git a/README.md b/README.md index 4f62f27..35b130e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## Intro -`srtool` is a collection of dockerized tools helping with [Substrate](https://substrate.dev) & [Polkadot](https://polkadot.network) Runtime development. `srtool` especially allows building WASM runtimes in a deterministic way, allowing CIs and users, with various machines and OS, to produce a strictly identical WASM runtime. +`srtool` is a collection of dockerized tools helping with [Substrate](https://substrate.io) & [Polkadot](https://polkadot.network) Runtime development. `srtool` especially allows building WASM runtimes in a deterministic way, allowing CIs and users, with various machines and OS, to produce a strictly identical WASM runtime. `srtool` can run on various Operating Systems supporting Docker. That includes Linux, MacOS and Windows. @@ -16,13 +16,13 @@ The Docker images are tagged with both the rustc version used internally as well You will find for instance the following: -- `paritytech/srtool:1.53.0-0.9.16` +- `paritytech/srtool:1.56.1-0.9.16` -- `paritytech/srtool:1.53.0-0.9.17` +- `paritytech/srtool:1.56.1-0.9.18` -- `paritytech/srtool:1.53.0` +- `paritytech/srtool:1.56.1` -The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.53.0` is the same image than `paritytech/srtool:1.53.0-0.9.17`. +The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.56.1` is the same image than `paritytech/srtool:1.56.1-0.9.18`. ## Related tools @@ -47,7 +47,7 @@ You may also want to have a look at [subwasm](https://github.com/chevdor/subwasm The project was initially developped from . It now moved to Github under the [Parity Technologies](https://www.github.com/paritytech) organisation to simplify the developement and the integration with other Parity products such as Polkadot and Kusama. -The last version hosted on Gitlab has been built using Rust Stable 1.53.0. It is tagged as v0.9.17 and there is no plan on updating the Gitlab repository further. New versions will be available from . The functionnalities remain the same so you can (and should!) simply swap `chevdor/srtool` for `paritytech/srtool` in your workflows. The [srtool-actions](https://github.com/chevdor/srtool-actions) will remain available as `chevdor/srtool-actions@` and will be updated to point at the paritytech image. +The last version hosted on Gitlab has been built using Rust Stable 1.56.1. It is tagged as v0.9.18 and there is no plan on updating the Gitlab repository further. New versions will be available from . The functionnalities remain the same so you can (and should!) simply swap `chevdor/srtool` for `paritytech/srtool` in your workflows. The [srtool-actions](https://github.com/chevdor/srtool-actions) will remain available as `chevdor/srtool-actions@` and will be updated to point at the paritytech image. ## Install @@ -63,7 +63,7 @@ This method is legacy and deprecated, prefer the `srtool-cli` utility mentioned Creating an alias helps hiding the docker complexity behind one simple command. We will see more powerful options but this one is simple enough. - export RUSTC_VERSION=1.53.0; export PACKAGE=kusama-runtime; alias srtool='docker run --rm -it -e PACKAGE=$PACKAGE -v $PWD:/build -v $TMPDIR/cargo:/cargo-home paritytech/srtool:$RUSTC_VERSION' + export RUSTC_VERSION=1.56.1; export PACKAGE=kusama-runtime; alias srtool='docker run --rm -it -e PACKAGE=$PACKAGE -v $PWD:/build -v $TMPDIR/cargo:/cargo-home paritytech/srtool:$RUSTC_VERSION' Note that defining the alias as done above will hardcode the runtime. Using `kusama-runtime` as show above means you will **always** check the kusama runtime. If you need more, check the next chapter. @@ -91,12 +91,12 @@ Invoking `srtool build` with: will output something that looks like this: - 🧰 Substrate Runtime Toolbox - srtool v0.9.17 🧰 + 🧰 Substrate Runtime Toolbox - srtool v0.9.18 🧰 - by Chevdor - - 🏗 Building polkadot-runtime as release using rustc 1.53.0 + 🏗 Building polkadot-runtime as release using rustc 1.56.1 ⏳ That can take a little while, be patient... subsequent builds will be faster. Since you have to wait a little, you may want to learn more about Substrate runtimes: - https://substrate.dev/docs/en/#architecture + https://docs.substrate.io/v3/getting-started/architecture/ Finished release [optimized] target(s) in 37.43s @@ -104,7 +104,7 @@ some times later …​ ✨ Your Substrate WASM Runtime is ready! ✨ Summary: - Generator : srtool v0.9.17 + Generator : srtool v0.9.18 Version : null GIT commit : 56b9e95a9b634695f59a7c699bc68a5cfb695f03 GIT tag : moonriver-genesis @@ -134,13 +134,13 @@ If you prefer a json output, srtool has you covered: Will give you such an output: { - "gen": "srtool v0.9.17", + "gen": "srtool v0.9.18", "src": "git", "version": "1.0.0", "commit": "85cad2ef48f123d7475385b00d113bc900324ad6", "tag": "statemine-v1.0.0", "branch": "wk-gh-actions", - "rustc": "rustc 1.53.0 (...)", + "rustc": "rustc 1.56.1 (...)", "pkg": "statemine-runtime", "tmsp": "2021-06-22T18:08:50Z", "size": "1538747", @@ -151,7 +151,7 @@ Will give you such an output: "info": { "generator": { "name": "srtool", - "version": "0.9.17" + "version": "0.9.18" }, "src": "git", "version": "1.0.0", @@ -160,7 +160,7 @@ Will give you such an output: "tag": "statemine-v1.0.0", "branch": "wk-gh-actions" }, - "rustc": "rustc 1.53.0 (...)", + "rustc": "rustc 1.56.1 (...)", "pkg": "statemine-runtime", "profile": "release" }, @@ -313,9 +313,9 @@ First you may want to double check what rustc versions are available as you will rustup check -So say you want to build a builder for rustc 1.53.0: +So say you want to build a builder for rustc 1.56.1: - RUSTC_VERSION=1.53.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION . + RUSTC_VERSION=1.56.1 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION . ## User Scripts @@ -329,7 +329,7 @@ You can see the list of available scripts in the `/scripts` folder: - `build`: Run the actual build -The `info` and `version` scripts pass any arguments you pass to the script to `jq`. So you can play with `c` (compact), `-M`(monochrome), `-C` color output. For instance `docker run --rm -it -v $PWD:/build chevdor/srtool:1.53.0 info -cM` shows a monochrome output on a single line. +The `info` and `version` scripts pass any arguments you pass to the script to `jq`. So you can play with `c` (compact), `-M`(monochrome), `-C` color output. For instance `docker run --rm -it -v $PWD:/build chevdor/srtool:1.56.1 info -cM` shows a monochrome output on a single line. ## Build your custom chain / parachain diff --git a/README_src.adoc b/README_src.adoc index 7cb430a..9e97086 100644 --- a/README_src.adoc +++ b/README_src.adoc @@ -1,6 +1,6 @@ :name: paritytech/srtool -:rsversion: 1.53.0 -:version: 0.9.17 +:rsversion: 1.56.1 +:version: 0.9.18 // :rsversion: pass:m[include:RUSTC_VERSION[]] // TODO: not working... :toc: right :sectnums: @@ -11,7 +11,7 @@ image::resources/srtool-docker_128px.png[align=center, width=128px] == Intro -`srtool` is a collection of dockerized tools helping with https://substrate.dev[Substrate] & https://polkadot.network[Polkadot] Runtime development. `srtool` especially allows building WASM runtimes in a deterministic way, allowing CIs and users, with various machines and OS, to produce a strictly identical WASM runtime. +`srtool` is a collection of dockerized tools helping with https://substrate.io[Substrate] & https://polkadot.network[Polkadot] Runtime development. `srtool` especially allows building WASM runtimes in a deterministic way, allowing CIs and users, with various machines and OS, to produce a strictly identical WASM runtime. `srtool` can run on various Operating Systems supporting Docker. That includes Linux, MacOS and Windows. @@ -101,7 +101,7 @@ will output something that looks like this: 🏗 Building polkadot-runtime as release using rustc {rsversion} ⏳ That can take a little while, be patient... subsequent builds will be faster. Since you have to wait a little, you may want to learn more about Substrate runtimes: - https://substrate.dev/docs/en/#architecture + https://docs.substrate.io/v3/getting-started/architecture/ Finished release [optimized] target(s) in 37.43s ---- diff --git a/RUSTC_VERSION b/RUSTC_VERSION index 3f48301..43c989b 100644 --- a/RUSTC_VERSION +++ b/RUSTC_VERSION @@ -1 +1 @@ -1.53.0 +1.56.1 diff --git a/VERSION b/VERSION index 4148992..7a50b68 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.17 +0.9.18 diff --git a/scripts/build b/scripts/build index 54df45d..0c34ff1 100755 --- a/scripts/build +++ b/scripts/build @@ -57,7 +57,7 @@ if [[ ! "$*" =~ --json || "$*" =~ --app ]]; then echo -e "🏗 Building $PACKAGE as $PROFILE using $RUSTCV" echo -e "⏳ That can take a little while, be patient... subsequent builds will be faster." echo -e " Since you have to wait a little, you may want to learn more about Substrate runtimes:" - echo -e " https://substrate.dev/docs/en/#architecture" + echo -e " https://docs.substrate.io/v3/getting-started/architecture/" fi # Build the runtime