mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 08:47:57 +00:00
Fixes bug in wasm-builder with cargo publish (#7299)
* Fixes bug in wasm-builder with cargo publish There was a bug in wasm-builder which resulted in generating a `Cargo.lock` in the project directory because of running `cargo metadata`. This resulted in commands like `cargo publish` to fail (if there was no `Cargo.lock` before building), because it checks that the project directory isn't modified. * Update utils/wasm-builder/src/wasm_project.rs Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
This commit is contained in:
@@ -181,16 +181,16 @@ pub fn build_project_with_default_rustflags(
|
||||
};
|
||||
|
||||
write_file_if_changed(
|
||||
file_name.into(),
|
||||
format!(
|
||||
r#"
|
||||
pub const WASM_BINARY: Option<&[u8]> = Some(include_bytes!("{wasm_binary}"));
|
||||
pub const WASM_BINARY_BLOATY: Option<&[u8]> = Some(include_bytes!("{wasm_binary_bloaty}"));
|
||||
"#,
|
||||
wasm_binary = wasm_binary,
|
||||
wasm_binary_bloaty = wasm_binary_bloaty,
|
||||
),
|
||||
);
|
||||
file_name.into(),
|
||||
format!(
|
||||
r#"
|
||||
pub const WASM_BINARY: Option<&[u8]> = Some(include_bytes!("{wasm_binary}"));
|
||||
pub const WASM_BINARY_BLOATY: Option<&[u8]> = Some(include_bytes!("{wasm_binary_bloaty}"));
|
||||
"#,
|
||||
wasm_binary = wasm_binary,
|
||||
wasm_binary_bloaty = wasm_binary_bloaty,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Checks if the build of the WASM binary should be skipped.
|
||||
|
||||
@@ -84,6 +84,28 @@ impl Drop for WorkspaceLock {
|
||||
}
|
||||
}
|
||||
|
||||
fn crate_metadata(cargo_manifest: &Path) -> Metadata {
|
||||
let mut cargo_lock = cargo_manifest.to_path_buf();
|
||||
cargo_lock.set_file_name("Cargo.lock");
|
||||
|
||||
let cargo_lock_existed = cargo_lock.exists();
|
||||
|
||||
let crate_metadata = MetadataCommand::new()
|
||||
.manifest_path(cargo_manifest)
|
||||
.exec()
|
||||
.expect("`cargo metadata` can not fail on project `Cargo.toml`; qed");
|
||||
|
||||
// If the `Cargo.lock` didn't exist, we need to remove it after
|
||||
// calling `cargo metadata`. This is required to ensure that we don't change
|
||||
// the build directory outside of the `target` folder. Commands like
|
||||
// `cargo publish` require this.
|
||||
if !cargo_lock_existed {
|
||||
let _ = fs::remove_file(&cargo_lock);
|
||||
}
|
||||
|
||||
crate_metadata
|
||||
}
|
||||
|
||||
/// Creates the WASM project, compiles the WASM binary and compacts the WASM binary.
|
||||
///
|
||||
/// # Returns
|
||||
@@ -98,10 +120,7 @@ pub fn create_and_compile(
|
||||
// Lock the workspace exclusively for us
|
||||
let _lock = WorkspaceLock::new(&wasm_workspace_root);
|
||||
|
||||
let crate_metadata = MetadataCommand::new()
|
||||
.manifest_path(cargo_manifest)
|
||||
.exec()
|
||||
.expect("`cargo metadata` can not fail on project `Cargo.toml`; qed");
|
||||
let crate_metadata = crate_metadata(cargo_manifest);
|
||||
|
||||
let project = create_project(cargo_manifest, &wasm_workspace, &crate_metadata);
|
||||
create_wasm_workspace_project(&wasm_workspace, &crate_metadata.workspace_root);
|
||||
|
||||
Reference in New Issue
Block a user