From c5a0803068499af775ab528a90226aa62fec9c0c Mon Sep 17 00:00:00 2001 From: stoically Date: Wed, 13 May 2020 14:48:36 +0200 Subject: [PATCH 1/2] travis: fail-fast for wasm target --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7667149b..b7c9377f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ jobs: name: wasm32-unknown-unknown before_script: - | + set -e cargo install wasm-bindgen-cli rustup target add wasm32-unknown-unknown wget https://github.com/emscripten-core/emsdk/archive/master.zip @@ -32,6 +33,7 @@ jobs: ./emsdk-master/emsdk activate latest script: - | + set -e source emsdk-master/emsdk_env.sh cd matrix_sdk/examples/wasm_command_bot cargo build --target wasm32-unknown-unknown From 0d12a5571fd25c8e3c2b3157e20f175cdabec93c Mon Sep 17 00:00:00 2001 From: stoically Date: Wed, 13 May 2020 15:02:28 +0200 Subject: [PATCH 2/2] matrix-sdk: VERSION isn't used for the wasm target --- matrix_sdk/src/client.rs | 1 + matrix_sdk/src/lib.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs index da3c741c..8d76ef22 100644 --- a/matrix_sdk/src/client.rs +++ b/matrix_sdk/src/client.rs @@ -44,6 +44,7 @@ use crate::Endpoint; use crate::identifiers::DeviceId; use crate::api; +#[cfg(not(target_arch = "wasm32"))] use crate::VERSION; use crate::{Error, EventEmitter, Result}; use matrix_sdk_base::BaseClient; diff --git a/matrix_sdk/src/lib.rs b/matrix_sdk/src/lib.rs index d8246fe5..9fca0ab2 100644 --- a/matrix_sdk/src/lib.rs +++ b/matrix_sdk/src/lib.rs @@ -53,4 +53,5 @@ pub use client::{Client, ClientConfig, SyncSettings}; pub use error::{Error, Result}; pub use request_builder::{MessagesRequestBuilder, RoomBuilder}; +#[cfg(not(target_arch = "wasm32"))] pub(crate) const VERSION: &str = env!("CARGO_PKG_VERSION");