Skip to content

Commit 0694200

Browse files
authored
chore: build latest srtool cli (#1038)
* chore: format code * chore: format code * chore: format edition * chore: build docker in ci * chore: fix rust * chore: fix branch
1 parent 5d21975 commit 0694200

File tree

3 files changed

+45
-3
lines changed

3 files changed

+45
-3
lines changed

.github/workflows/generate-srtool-wasm.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,27 @@ jobs:
1919

2020
- uses: ./.github/actions/free-disk-space
2121

22+
- name: Checkout srtool
23+
uses: actions/checkout@v4
24+
with:
25+
repository: paritytech/srtool
26+
path: srtool-repo
27+
28+
- name: Get Rust version from toolchain
29+
id: rust-version
30+
run: |
31+
# Read Rust version from rust-toolchain.toml
32+
RUST_VERSION=$(grep 'channel = ' rust-toolchain.toml | sed 's/.*channel = "\([^"]*\)".*/\1/')
33+
echo "version=$RUST_VERSION" >> $GITHUB_OUTPUT
34+
echo "Using Rust version from rust-toolchain.toml: $RUST_VERSION"
35+
36+
- name: Build srtool Docker image
37+
run: |
38+
cd srtool-repo
39+
RUSTC_VERSION=${{ steps.rust-version.outputs.version }}
40+
echo "Building srtool with Rust $RUSTC_VERSION"
41+
docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t local-srtool:latest .
42+
2243
- name: Run Srtool build
2344
id: srtool_build
2445
shell: bash
@@ -36,7 +57,7 @@ jobs:
3657
-e RUNTIME_DIR=runtime/${{ matrix.chain }} \
3758
-e BUILD_OPTS="--features runtime-benchmarks" \
3859
-v $(pwd):/build \
39-
paritytech/srtool:1.84.1 build
60+
local-srtool:latest build
4061
4162
- name: Summary
4263
run: |

.github/workflows/publish-srtool-wasm.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,27 @@ jobs:
1616
- uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
19+
20+
- name: Checkout srtool
21+
uses: actions/checkout@v4
22+
with:
23+
repository: paritytech/srtool
24+
path: srtool-repo
25+
26+
- name: Get Rust version from toolchain
27+
id: rust-version
28+
run: |
29+
# Read Rust version from rust-toolchain.toml
30+
RUST_VERSION=$(grep 'channel = ' rust-toolchain.toml | sed 's/.*channel = "\([^"]*\)".*/\1/')
31+
echo "version=$RUST_VERSION" >> $GITHUB_OUTPUT
32+
echo "Using Rust version from rust-toolchain.toml: $RUST_VERSION"
33+
34+
- name: Build srtool Docker image
35+
run: |
36+
cd srtool-repo
37+
RUSTC_VERSION=${{ steps.rust-version.outputs.version }}
38+
echo "Building srtool with Rust $RUSTC_VERSION"
39+
docker build --build-arg RUSTC_VERSION=$RUSTC_VERSION -t local-srtool:latest .
1940
2041
- name: Run Srtool build
2142
id: srtool_build
@@ -34,7 +55,7 @@ jobs:
3455
-e RUNTIME_DIR=runtime/${{ matrix.chain }} \
3556
-e BUILD_OPTS="--features on-chain-release-build" \
3657
-v $(pwd):/build \
37-
paritytech/srtool:1.84.1 build
58+
local-srtool:latest build
3859
3960
- name: Summary
4061
run: |

runtime/mainnet/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ pub type Executive = frame_executive::Executive<
15301530
frame_system::ChainContext<Runtime>,
15311531
Runtime,
15321532
AllPalletsWithSystem,
1533-
(migrations::staking_team_reduction_03062025::UpdateTeamMemberAllocation<Runtime>,),
1533+
(),
15341534
>;
15351535

15361536
impl fp_self_contained::SelfContainedCall for RuntimeCall {

0 commit comments

Comments
 (0)