From 5ba9cd1cfd39632e634481347ebe008681abcd6b Mon Sep 17 00:00:00 2001 From: EgorPopelyaev Date: Mon, 30 Sep 2024 14:19:40 +0200 Subject: [PATCH] Update rust to 1.81.0 and add BUILD_OPTIONS to the manual build --- .github/workflows/manual-acala.yml | 2 +- .github/workflows/manual-fellow-runtimes.yml | 2 +- .github/workflows/manual-moonbeam.yml | 2 +- .github/workflows/manual-polkadot-sdk.yml | 2 +- .github/workflows/manual-shiden.yml | 2 +- .github/workflows/manual.yml | 8 ++++- Dockerfile | 2 +- README.md | 34 ++++++++++---------- README_src.adoc | 4 +-- RUSTC_VERSION | 2 +- VERSION | 2 +- 11 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.github/workflows/manual-acala.yml b/.github/workflows/manual-acala.yml index 6eb85ed..c528d1a 100644 --- a/.github/workflows/manual-acala.yml +++ b/.github/workflows/manual-acala.yml @@ -8,7 +8,7 @@ on: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.77.0 + default: 1.81.0 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-fellow-runtimes.yml b/.github/workflows/manual-fellow-runtimes.yml index b0659c5..441b5e1 100644 --- a/.github/workflows/manual-fellow-runtimes.yml +++ b/.github/workflows/manual-fellow-runtimes.yml @@ -12,7 +12,7 @@ on: default: paritytech/srtool srtool_tag: description: The SRTOOL tag to use - default: 1.77.0 + default: 1.81.0 required: false repo: description: The repo to be used to build runtimes from diff --git a/.github/workflows/manual-moonbeam.yml b/.github/workflows/manual-moonbeam.yml index a37da87..f66b52a 100644 --- a/.github/workflows/manual-moonbeam.yml +++ b/.github/workflows/manual-moonbeam.yml @@ -8,7 +8,7 @@ on: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.77.0 + default: 1.81.0 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual-polkadot-sdk.yml b/.github/workflows/manual-polkadot-sdk.yml index 9ffb614..65edc78 100644 --- a/.github/workflows/manual-polkadot-sdk.yml +++ b/.github/workflows/manual-polkadot-sdk.yml @@ -12,7 +12,7 @@ on: default: paritytech/srtool srtool_tag: description: The SRTOOL tag to use - default: 1.77.0 + default: 1.81.0 repo: description: The repo to be used to build runtimes from default: paritytech/polkadot-sdk diff --git a/.github/workflows/manual-shiden.yml b/.github/workflows/manual-shiden.yml index 7255b41..f42ef57 100644 --- a/.github/workflows/manual-shiden.yml +++ b/.github/workflows/manual-shiden.yml @@ -8,7 +8,7 @@ on: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.77.0 + default: 1.81.0 required: false ref: description: The ref to be used for the repo diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index ee24a52..43f88eb 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -8,7 +8,7 @@ on: inputs: srtool_tag: description: The SRTOOL tag to use - default: 1.77.0 + default: 1.81.0 required: false srtool_image: description: The SRTOOL image to use @@ -34,6 +34,10 @@ on: description: The ref to be used for the repo default: master required: false + build_opts: + description: The build options to be used to build runtime (can be left empty) + required: false + jobs: build: name: Build ${{ github.event.inputs.repository }}/${{ github.event.inputs.package }} ${{ github.event.inputs.ref }} @@ -48,6 +52,8 @@ jobs: - name: Srtool build id: srtool_build uses: chevdor/srtool-actions@v0.9.2 + env: + BUILD_OPTS: ${{ inputs.build_opts }} with: chain: ${{ github.event.inputs.chain }} package: ${{ github.event.inputs.package }} diff --git a/Dockerfile b/Dockerfile index 479ba57..b70f08b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM docker.io/library/ubuntu:22.04 LABEL maintainer "chevdor@gmail.com" LABEL description="This image contains tools for Substrate blockchains runtimes." -ARG RUSTC_VERSION="1.77.0" +ARG RUSTC_VERSION="1.81.0" ENV RUSTC_VERSION=$RUSTC_VERSION ENV DOCKER_IMAGE="paritytech/srtool" ENV PROFILE=release diff --git a/README.md b/README.md index e330f26..03444e0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Substrate Runtime Toolbox: srtool v0.15.0 +# Substrate Runtime Toolbox: srtool v0.16.0 ![srtool docker 128px](resources/srtool-docker_128px.png) @@ -18,11 +18,11 @@ The Docker images are tagged with both the rustc version used internally as well You may find for instance the following: -- `paritytech/srtool:1.77.0-0.15.0` +- `paritytech/srtool:1.81.0-0.16.0` -- `paritytech/srtool:1.77.0` +- `paritytech/srtool:1.81.0` -The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.77.0` is the same image than `paritytech/srtool:1.77.0-0.15.0`. +The tags not mentioning the build version always point to the latest one. In the example above, `paritytech/srtool:1.81.0` is the same image than `paritytech/srtool:1.81.0-0.16.0`. ## 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 developed by . 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.77.0. It is tagged as v0.15.0 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@` and will be updated to point at the paritytech image. +The last version hosted on Gitlab has been built using Rust Stable 1.81.0. It is tagged as v0.16.0 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@` and will be updated to point at the paritytech image. ## Install @@ -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.77.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.81.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. @@ -91,9 +91,9 @@ Invoking `srtool build` with will output something that looks like this: - 🧰 Substrate Runtime Toolbox - srtool v0.15.0 🧰 + 🧰 Substrate Runtime Toolbox - srtool v0.16.0 🧰 - by Chevdor - - 🏗 Building polkadot-runtime as release using rustc 1.77.0 + 🏗 Building polkadot-runtime as release using rustc 1.81.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/learn/architecture/ @@ -104,7 +104,7 @@ and finally …​ ✨ Your Substrate WASM Runtime is ready! ✨ Summary: - Generator : srtool v0.15.0 + Generator : srtool v0.16.0 Version : null GIT commit : 56b9e95a9b634695f59a7c699bc68a5cfb695f03 GIT tag : moonriver-genesis @@ -134,13 +134,13 @@ If you prefer a json output, srtool has you covered: The output will look something like: { - "gen": "srtool v0.15.0", + "gen": "srtool v0.16.0", "src": "git", "version": "1.0.0", "commit": "85cad2ef48f123d7475385b00d113bc900324ad6", "tag": "statemine-v1.0.0", "branch": "wk-gh-actions", - "rustc": "rustc 1.77.0 (...)", + "rustc": "rustc 1.81.0 (...)", "pkg": "statemine-runtime", "tmsp": "2021-06-22T18:08:50Z", "size": "1538747", @@ -151,7 +151,7 @@ The output will look something like: "info": { "generator": { "name": "srtool", - "version": "0.15.0" + "version": "0.16.0" }, "src": "git", "version": "1.0.0", @@ -160,7 +160,7 @@ The output will look something like: "tag": "statemine-v1.0.0", "branch": "wk-gh-actions" }, - "rustc": "rustc 1.77.0 (...)", + "rustc": "rustc 1.81.0 (...)", "pkg": "statemine-runtime", "profile": "release" }, @@ -301,7 +301,7 @@ You can see the list of available scripts in the `/scripts` folder: - `scan`: Scan a repo for runtimes -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.77.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.81.0 info -cM` shows a monochrome output on a single line. ## Build your custom chain / parachain @@ -332,7 +332,7 @@ If you mount this docker volume, you will find the wasm on your local filesystem # REPO=fellowship-runtimes podman run --rm -it \ -v $REPO:/build \ - `paritytech/srtool:1.77.0-0.15.0` scan + `paritytech/srtool:1.81.0-0.16.0` scan ## ZSH/ Zinit users @@ -360,6 +360,6 @@ 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.77.0: +So say you want to build a builder for rustc 1.81.0: - RUSTC_VERSION=1.77.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION . + RUSTC_VERSION=1.81.0 && docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t paritytech/srtool:$RUSTC_VERSION . diff --git a/README_src.adoc b/README_src.adoc index 593a5ce..8b95f5d 100644 --- a/README_src.adoc +++ b/README_src.adoc @@ -1,6 +1,6 @@ :name: paritytech/srtool -:rsversion: 1.77.0 -:version: 0.15.0 +:rsversion: 1.81.0 +:version: 0.16.0 // :rsversion: pass:m[include:RUSTC_VERSION[]] // TODO: not working... :toc: right :sectnums: diff --git a/RUSTC_VERSION b/RUSTC_VERSION index 79e15fd..dbd4126 100644 --- a/RUSTC_VERSION +++ b/RUSTC_VERSION @@ -1 +1 @@ -1.77.0 +1.81.0 diff --git a/VERSION b/VERSION index a551051..04a373e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.15.0 +0.16.0