fix(ci): remove all forklift usage and update runtime-interface UI test stderr
- 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:
@@ -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)
|
||||
|
||||
warning: unexpected `cfg` condition name: `substrate_runtime`
|
||||
warning: unexpected `cfg` condition name: `bizinikiwi_runtime`
|
||||
--> tests/ui/no_feature_gated_method.rs:28:2
|
||||
|
|
||||
28 | #[cfg(feature = "bar-feature")]
|
||||
@@ -36,8 +36,8 @@ warning: unexpected `cfg` condition name: `substrate_runtime`
|
||||
= help: consider using a Cargo feature instead
|
||||
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
|
||||
[lints.rust]
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(substrate_runtime)'] }
|
||||
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(substrate_runtime)");` to the top of the `build.rs`
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bizinikiwi_runtime)'] }
|
||||
= 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: `#[warn(unexpected_cfgs)]` on by default
|
||||
|
||||
@@ -47,11 +47,11 @@ warning: unexpected `cfg` condition value: `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`
|
||||
= 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
|
||||
|
|
||||
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
|
||||
= 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: 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
|
||||
|
|
||||
26 | fn foo() {}
|
||||
@@ -72,11 +72,11 @@ warning: unexpected `cfg` condition name: `substrate_runtime`
|
||||
= help: consider using a Cargo feature instead
|
||||
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
|
||||
[lints.rust]
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(substrate_runtime)'] }
|
||||
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(substrate_runtime)");` to the top of the `build.rs`
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bizinikiwi_runtime)'] }
|
||||
= 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
|
||||
|
||||
warning: unexpected `cfg` condition name: `substrate_runtime`
|
||||
warning: unexpected `cfg` condition name: `bizinikiwi_runtime`
|
||||
--> tests/ui/no_feature_gated_method.rs:31:2
|
||||
|
|
||||
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: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
|
||||
[lints.rust]
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(substrate_runtime)'] }
|
||||
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(substrate_runtime)");` to the top of the `build.rs`
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bizinikiwi_runtime)'] }
|
||||
= 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
|
||||
|
||||
warning: unexpected `cfg` condition value: `bar-feature`
|
||||
@@ -95,6 +95,6 @@ warning: unexpected `cfg` condition value: `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`
|
||||
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
|
||||
|
||||
@@ -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
|
||||
// rustup toolchain we've picked.
|
||||
.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
|
||||
.env(crate::SKIP_BUILD_ENV, "");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user