From bdb1fb1724d185a5b405172f29bfdb72cd558ccf Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 26 Feb 2020 13:50:53 +0000
Subject: [PATCH 1/3] Fail the build if xbuild fails

---
 src/cmd/build.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cmd/build.rs b/src/cmd/build.rs
index 20671fff..a0c4aa9a 100644
--- a/src/cmd/build.rs
+++ b/src/cmd/build.rs
@@ -130,7 +130,10 @@ fn build_cargo_project(crate_metadata: &CrateMetadata, verbosity: Option<Verbosi
         let exit_status = xargo_lib::build(args, "build", Some(config))
             .map_err(|e| anyhow::anyhow!("{}", e))
             .context("Building with xbuild")?;
-        log::debug!("xargo exit status: {:?}", exit_status);
+        log::debug!("xbuild exit status: {}", exit_status);
+        if !exit_status.success() {
+            anyhow::bail!("xbuild failed with status {}", exit_status)
+        }
         Ok(())
     };
 
-- 
GitLab


From feddba368533a2386d9c3ab11426308cc4b20f67 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 26 Feb 2020 13:54:58 +0000
Subject: [PATCH 2/3] Debug log now redundant

---
 src/cmd/build.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cmd/build.rs b/src/cmd/build.rs
index a0c4aa9a..0537b19a 100644
--- a/src/cmd/build.rs
+++ b/src/cmd/build.rs
@@ -130,7 +130,6 @@ fn build_cargo_project(crate_metadata: &CrateMetadata, verbosity: Option<Verbosi
         let exit_status = xargo_lib::build(args, "build", Some(config))
             .map_err(|e| anyhow::anyhow!("{}", e))
             .context("Building with xbuild")?;
-        log::debug!("xbuild exit status: {}", exit_status);
         if !exit_status.success() {
             anyhow::bail!("xbuild failed with status {}", exit_status)
         }
-- 
GitLab


From 3e9d86d57a131afc52cf04c76d16004d8ac84d8c Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 26 Feb 2020 14:33:23 +0000
Subject: [PATCH 3/3] Add wasm-opt to release notes

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38923c68..d84e1ea6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Version 0.4.0 (2020-02-26)
 
 - Minimize contract wasm binary size:
+  - Run `wasm-opt` on the contract Wasm binary.
   - Uses [`cargo-xbuild`](https://github.com/rust-osdev/cargo-xbuild) to build custom sysroot crates without panic string
 bloat.
   - Automatically removes the `rlib` crate type from `Cargo.toml`, removing redundant metadata.
-- 
GitLab