pezkuwichain/pezkuwi-sdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ci): remove all forklift usage and update runtime-interface UI test stderr

Browse Source 
- Remove forklift cargo wrapper from build-only-wasm.sh (direct cause of
  build-linux-stable failures in container jobs)
- Add .env_remove("RUSTC_WRAPPER") to wasm-builder cargo subprocess to
  prevent inheriting forklift from Parity CI container images
- Remove forklift from cargo-check-runtimes action and cmd.py benchmark
  build command
- Update test_cmd.py expectations to match forklift removal
- Update no_feature_gated_method.stderr for rebrand: substrate_runtime →
  bizinikiwi_runtime, sp_runtime_interface_proc_macro →
  pezsp_runtime_interface_proc_macro, and expanded feature list
This commit is contained in:
Kurdistan Tech Ministry
2026-03-01 07:58:42 +03:00
parent 8f7a2d09f2
commit 233f6fcb9d
6 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/actions/cargo-check-runtimes/action.yml
+1 -3
View File
@@ -10,13 +10,11 @@ runs:
- name: Check - name: Check
shell: bash shell: bash
run: | run: |
mkdir -p ~/.forklift
cp .forklift/config.toml ~/.forklift/config.toml
cd ${{ inputs.root }} cd ${{ inputs.root }}
for directory in $(echo */); do for directory in $(echo */); do
echo "_____Running cargo check for ${directory} ______"; echo "_____Running cargo check for ${directory} ______";
cd ${directory}; cd ${directory};
pwd; pwd;
SKIP_WASM_BUILD=1 forklift cargo check --locked; SKIP_WASM_BUILD=1 cargo check --locked;
cd ..; cd ..;
done done
.github/scripts/cmd/cmd.py
+1 -1
View File
@@ -346,7 +346,7 @@ def main():
# loop over remaining runtimes to collect available pallets # loop over remaining runtimes to collect available pallets
for runtime in runtimesMatrix.values(): for runtime in runtimesMatrix.values():
build_command = f"forklift cargo build -q -p {runtime['package']} --profile {profile} --features={runtime['bench_features']}" build_command = f"cargo build -q -p {runtime['package']} --profile {profile} --features={runtime['bench_features']}"
print(f'-- building "{runtime["name"]}" with `{build_command}`') print(f'-- building "{runtime["name"]}" with `{build_command}`')
build_status = os.system(build_command) build_status = os.system(build_command)
if build_status != 0: if build_status != 0:
.github/scripts/cmd/test_cmd.py
+11 -11
View File
@@ -117,10 +117,10 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p kitchensink-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p kitchensink-runtime --profile production --features=runtime-benchmarks"),
call("forklift cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"),
call("forklift cargo build -q -p pezkuwichain-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p pezkuwichain-runtime --profile production --features=runtime-benchmarks"),
call("forklift cargo build -q -p asset-hub-zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p asset-hub-zagros-runtime --profile production --features=runtime-benchmarks"),
call(get_mock_bench_output( call(get_mock_bench_output(
runtime='kitchensink', runtime='kitchensink',
@@ -170,7 +170,7 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"),
# Zagros runtime calls # Zagros runtime calls
call(get_mock_bench_output( call(get_mock_bench_output(
@@ -213,7 +213,7 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"),
# Zagros runtime calls # Zagros runtime calls
call(get_mock_bench_output( call(get_mock_bench_output(
@@ -250,8 +250,8 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p zagros-runtime --profile production --features=runtime-benchmarks"),
call("forklift cargo build -q -p pezkuwichain-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p pezkuwichain-runtime --profile production --features=runtime-benchmarks"),
# Zagros runtime calls # Zagros runtime calls
call(get_mock_bench_output( call(get_mock_bench_output(
runtime='zagros', runtime='zagros',
@@ -309,7 +309,7 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p kitchensink-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p kitchensink-runtime --profile production --features=runtime-benchmarks"),
# Westend runtime calls # Westend runtime calls
call(get_mock_bench_output( call(get_mock_bench_output(
runtime='kitchensink', runtime='kitchensink',
@@ -344,7 +344,7 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p asset-hub-zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p asset-hub-zagros-runtime --profile production --features=runtime-benchmarks"),
# Asset-hub-zagros runtime calls # Asset-hub-zagros runtime calls
call(get_mock_bench_output( call(get_mock_bench_output(
runtime='asset-hub-zagros', runtime='asset-hub-zagros',
@@ -379,7 +379,7 @@ class TestCmd(unittest.TestCase):
expected_calls = [ expected_calls = [
# Build calls # Build calls
call("forklift cargo build -q -p asset-hub-zagros-runtime --profile production --features=runtime-benchmarks"), call("cargo build -q -p asset-hub-zagros-runtime --profile production --features=runtime-benchmarks"),
# Asset-hub-zagros runtime calls # Asset-hub-zagros runtime calls
call(get_mock_bench_output( call(get_mock_bench_output(
runtime='asset-hub-zagros', runtime='asset-hub-zagros',
bizinikiwi/primitives/runtime-interface/tests/ui/no_feature_gated_method.stderr
+13 -13
View File
@@ -26,7 +26,7 @@ note: the item is gated here
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
= note: this error originates in the attribute macro `runtime_interface` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the attribute macro `runtime_interface` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: unexpected `cfg` condition name: `substrate_runtime` warning: unexpected `cfg` condition name: `bizinikiwi_runtime`
--> tests/ui/no_feature_gated_method.rs:28:2 --> tests/ui/no_feature_gated_method.rs:28:2
| |
28 | #[cfg(feature = "bar-feature")] 28 | #[cfg(feature = "bar-feature")]
@@ -36,8 +36,8 @@ warning: unexpected `cfg` condition name: `substrate_runtime`
= help: consider using a Cargo feature instead = help: consider using a Cargo feature instead
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint: = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
[lints.rust] [lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(substrate_runtime)'] } unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bizinikiwi_runtime)'] }
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(substrate_runtime)");` to the top of the `build.rs` = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(bizinikiwi_runtime)");` to the top of the `build.rs`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
@@ -47,11 +47,11 @@ warning: unexpected `cfg` condition value: `bar-feature`
28 | #[cfg(feature = "bar-feature")] 28 | #[cfg(feature = "bar-feature")]
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
| |
= note: expected values for `feature` are: `default`, `disable_target_static_assertions`, and `std` = note: expected values for `feature` are: `default`, `disable_target_static_assertions`, `runtime-benchmarks`, `serde`, `std`, and `with-tracing`
= help: consider adding `bar-feature` as a feature in `Cargo.toml` = help: consider adding `bar-feature` as a feature in `Cargo.toml`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `substrate_runtime` warning: unexpected `cfg` condition name: `bizinikiwi_runtime`
--> tests/ui/no_feature_gated_method.rs:24:1 --> tests/ui/no_feature_gated_method.rs:24:1
| |
24 | #[runtime_interface] 24 | #[runtime_interface]
@@ -59,11 +59,11 @@ warning: unexpected `cfg` condition name: `substrate_runtime`
| |
= note: using a cfg inside a attribute macro will use the cfgs from the destination crate and not the ones from the defining crate = note: using a cfg inside a attribute macro will use the cfgs from the destination crate and not the ones from the defining crate
= help: try referring to `runtime_interface` crate for guidance on how handle this unexpected cfg = help: try referring to `runtime_interface` crate for guidance on how handle this unexpected cfg
= help: the attribute macro `runtime_interface` may come from an old version of the `sp_runtime_interface_proc_macro` crate, try updating your dependency with `cargo update -p sp_runtime_interface_proc_macro` = help: the attribute macro `runtime_interface` may come from an old version of the `pezsp_runtime_interface_proc_macro` crate, try updating your dependency with `cargo update -p pezsp_runtime_interface_proc_macro`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: this warning originates in the attribute macro `runtime_interface` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this warning originates in the attribute macro `runtime_interface` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: unexpected `cfg` condition name: `substrate_runtime` warning: unexpected `cfg` condition name: `bizinikiwi_runtime`
--> tests/ui/no_feature_gated_method.rs:26:2 --> tests/ui/no_feature_gated_method.rs:26:2
| |
26 | fn foo() {} 26 | fn foo() {}
@@ -72,11 +72,11 @@ warning: unexpected `cfg` condition name: `substrate_runtime`
= help: consider using a Cargo feature instead = help: consider using a Cargo feature instead
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint: = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
[lints.rust] [lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(substrate_runtime)'] } unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bizinikiwi_runtime)'] }
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(substrate_runtime)");` to the top of the `build.rs` = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(bizinikiwi_runtime)");` to the top of the `build.rs`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `substrate_runtime` warning: unexpected `cfg` condition name: `bizinikiwi_runtime`
--> tests/ui/no_feature_gated_method.rs:31:2 --> tests/ui/no_feature_gated_method.rs:31:2
| |
31 | #[cfg(not(feature = "bar-feature"))] 31 | #[cfg(not(feature = "bar-feature"))]
@@ -85,8 +85,8 @@ warning: unexpected `cfg` condition name: `substrate_runtime`
= help: consider using a Cargo feature instead = help: consider using a Cargo feature instead
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint: = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
[lints.rust] [lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(substrate_runtime)'] } unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bizinikiwi_runtime)'] }
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(substrate_runtime)");` to the top of the `build.rs` = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(bizinikiwi_runtime)");` to the top of the `build.rs`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition value: `bar-feature` warning: unexpected `cfg` condition value: `bar-feature`
@@ -95,6 +95,6 @@ warning: unexpected `cfg` condition value: `bar-feature`
31 | #[cfg(not(feature = "bar-feature"))] 31 | #[cfg(not(feature = "bar-feature"))]
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
| |
= note: expected values for `feature` are: `default`, `disable_target_static_assertions`, and `std` = note: expected values for `feature` are: `default`, `disable_target_static_assertions`, `runtime-benchmarks`, `serde`, `std`, and `with-tracing`
= help: consider adding `bar-feature` as a feature in `Cargo.toml` = help: consider adding `bar-feature` as a feature in `Cargo.toml`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
bizinikiwi/utils/wasm-builder/src/wasm_project.rs
+3
View File
@@ -901,6 +901,9 @@ fn build_bloaty_blob(
// Make sure if we're called from within a `build.rs` the host toolchain won't override a // Make sure if we're called from within a `build.rs` the host toolchain won't override a
// rustup toolchain we've picked. // rustup toolchain we've picked.
.env_remove("RUSTC") .env_remove("RUSTC")
// Remove any RUSTC_WRAPPER (e.g. Parity's forklift GCS cache) that would fail
// without GCP credentials on non-Parity CI environments.
.env_remove("RUSTC_WRAPPER")
// We don't want to call ourselves recursively // We don't want to call ourselves recursively
.env(crate::SKIP_BUILD_ENV, ""); .env(crate::SKIP_BUILD_ENV, "");
pezkuwi/scripts/build-only-wasm.sh
+1 -5
View File
@@ -14,11 +14,7 @@ fi
WASM_BUILDER_RUNNER="$PROJECT_ROOT/target/release/wbuild-runner/$1" WASM_BUILDER_RUNNER="$PROJECT_ROOT/target/release/wbuild-runner/$1"
fl_cargo () { fl_cargo () {
if command -v forklift >/dev/null 2>&1; then cargo "$@";
forklift cargo "$@";
else
cargo "$@";
fi
} }
if [ -z "$2" ]; then if [ -z "$2" ]; then