Skip to content

Commit

Permalink
Preparation for release v0.9.22 (#50)
Browse files Browse the repository at this point in the history
* Switch to Rust 1.64 and bump version to 0.9.22

* Bump tools (tera & toml) to their latest versions

* Add protobuf compiler
  • Loading branch information
chevdor authored Oct 14, 2022
1 parent 72b4aa0 commit de32f78
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manual-acala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
inputs:
srtool_tag:
description: The SRTOOL tag to use
default: 1.62.0
default: 1.64.0
required: false
ref:
description: The ref to be used for the repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-cumulus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
inputs:
srtool_tag:
description: The SRTOOL tag to use
default: 1.62.0
default: 1.64.0
required: false
ref:
description: The ref to be used for the repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-moonbeam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
inputs:
srtool_tag:
description: The SRTOOL tag to use
default: 1.62.0
default: 1.64.0
required: false
ref:
description: The ref to be used for the repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-polkadot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
inputs:
srtool_tag:
description: The SRTOOL tag to use
default: 1.62.0
default: 1.64.0
required: false
ref:
description: The ref to be used for the repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-shiden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
inputs:
srtool_tag:
description: The SRTOOL tag to use
default: 1.62.0
default: 1.64.0
required: false
ref:
description: The ref to be used for the repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
inputs:
srtool_tag:
description: The SRTOOL tag to use
default: 1.62.0
default: 1.64.0
required: false
srtool_image:
description: The SRTOOL image to use
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM docker.io/library/ubuntu:22.04
LABEL maintainer "[email protected]"
LABEL description="This image contains tools for Substrate blockchains runtimes."

ARG RUSTC_VERSION="1.62.0"
ARG RUSTC_VERSION="1.64.0"
ENV RUSTC_VERSION=$RUSTC_VERSION
ENV DOCKER_IMAGE="paritytech/srtool"
ENV PROFILE=release
Expand All @@ -25,14 +25,14 @@ ENV DEBIAN_FRONTEND=noninteractive

# Tooling
ARG SUBWASM_VERSION=0.18.0
ARG TERA_CLI_VERSION=0.2.1
ARG TOML_CLI_VERSION=0.2.1
ARG TERA_CLI_VERSION=0.2.2
ARG TOML_CLI_VERSION=0.2.2

COPY ./templates ${SRTOOL_TEMPLATES}/
RUN apt update && \
apt upgrade -y && \
apt install --no-install-recommends -y \
cmake pkg-config libssl-dev make \
cmake pkg-config libssl-dev make protobuf-compiler \
git clang bsdmainutils ca-certificates curl && \
curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 --output /usr/bin/jq && chmod a+x /usr/bin/jq && \
rm -rf /var/lib/apt/lists/* /tmp/* && apt clean
Expand Down
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Substrate Runtime Toolbox: srtool
# Substrate Runtime Toolbox: srtool v0.9.22

![srtool docker 128px](resources/srtool-docker_128px.png)

Expand All @@ -16,13 +16,13 @@ The Docker images are tagged with both the rustc version used internally as well

You may find for instance the following:

- `paritytech/srtool:1.62.0-0.9.19`
- `paritytech/srtool:1.64.0-0.9.19`

- `paritytech/srtool:1.62.0-0.9.21`
- `paritytech/srtool:1.64.0-0.9.22`

- `paritytech/srtool:1.62.0`
- `paritytech/srtool:1.64.0`

The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.62.0` is the same image than `paritytech/srtool:1.62.0-0.9.21`.
The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.64.0` is the same image than `paritytech/srtool:1.64.0-0.9.22`.

## Related tools

Expand All @@ -47,7 +47,7 @@ You may also want to have a look at [subwasm](https://github.com/chevdor/subwasm
The project was initially developed by <https://gitlab.com/chevdor>.
It has 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.62.0. It is tagged as v0.9.21 and there is no plan on updating the Gitlab repository further. New versions will be available from [this repository](https://www.github.com/paritytech/srtool) only. The functionalities 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@<version>` and will be updated to point at the paritytech image.
The last version hosted on Gitlab has been built using Rust Stable 1.64.0. It is tagged as v0.9.22 and there is no plan on updating the Gitlab repository further. New versions will be available from [this repository](https://www.github.com/paritytech/srtool) only. The functionalities 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@<version>` and will be updated to point at the paritytech image.

## Install

Expand All @@ -63,7 +63,7 @@ This method is legacy and deprecated. It is recommended to use the `srtool-cli`

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.62.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.64.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'

Note that defining the alias as done above will hardcode the runtime. Using `kusama-runtime` as shown above means you will **always** check the Kusama runtime. If you need more, check the next chapter.

Expand Down Expand Up @@ -91,9 +91,9 @@ Invoking `srtool build` with

will output something that looks like this:

🧰 Substrate Runtime Toolbox - srtool v0.9.21 🧰
🧰 Substrate Runtime Toolbox - srtool v0.9.22 🧰
- by Chevdor -
🏗 Building polkadot-runtime as release using rustc 1.62.0
🏗 Building polkadot-runtime as release using rustc 1.64.0
⏳ 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://docs.substrate.io/v3/getting-started/architecture/
Expand All @@ -104,7 +104,7 @@ and finally …​

✨ Your Substrate WASM Runtime is ready! ✨
Summary:
Generator : srtool v0.9.21
Generator : srtool v0.9.22
Version : null
GIT commit : 56b9e95a9b634695f59a7c699bc68a5cfb695f03
GIT tag : moonriver-genesis
Expand Down Expand Up @@ -134,13 +134,13 @@ If you prefer a json output, srtool has you covered:
The output will look something like:

{
"gen": "srtool v0.9.21",
"gen": "srtool v0.9.22",
"src": "git",
"version": "1.0.0",
"commit": "85cad2ef48f123d7475385b00d113bc900324ad6",
"tag": "statemine-v1.0.0",
"branch": "wk-gh-actions",
"rustc": "rustc 1.62.0 (...)",
"rustc": "rustc 1.64.0 (...)",
"pkg": "statemine-runtime",
"tmsp": "2021-06-22T18:08:50Z",
"size": "1538747",
Expand All @@ -151,7 +151,7 @@ The output will look something like:
"info": {
"generator": {
"name": "srtool",
"version": "0.9.21"
"version": "0.9.22"
},
"src": "git",
"version": "1.0.0",
Expand All @@ -160,7 +160,7 @@ The output will look something like:
"tag": "statemine-v1.0.0",
"branch": "wk-gh-actions"
},
"rustc": "rustc 1.62.0 (...)",
"rustc": "rustc 1.64.0 (...)",
"pkg": "statemine-runtime",
"profile": "release"
},
Expand Down Expand Up @@ -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.62.0:
So say you want to build a builder for rustc 1.64.0:

RUSTC_VERSION=1.62.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION .
RUSTC_VERSION=1.64.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION .

## User Scripts

Expand All @@ -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.62.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.64.0 info -cM` shows a monochrome output on a single line.

## Build your custom chain / parachain

Expand Down
6 changes: 3 additions & 3 deletions README_src.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
:name: paritytech/srtool
:rsversion: 1.62.0
:version: 0.9.21
:rsversion: 1.64.0
:version: 0.9.22
// :rsversion: pass:m[include:RUSTC_VERSION[]] // TODO: not working...
:toc: right
:sectnums:

= Substrate Runtime Toolbox: srtool
= Substrate Runtime Toolbox: srtool v{version}

image::resources/srtool-docker_128px.png[align=center, width=128px]

Expand Down
2 changes: 1 addition & 1 deletion RUSTC_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.62.0
1.64.0
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.21
0.9.22

0 comments on commit de32f78

Please sign in to comment.