Merge branch 'fail-fast-travis'

master
Damir Jelić 2020-05-13 15:58:32 +02:00
commit f803c5be6d
3 changed files with 4 additions and 0 deletions

View File

@ -24,6 +24,7 @@ jobs:
name: wasm32-unknown-unknown name: wasm32-unknown-unknown
before_script: before_script:
- | - |
set -e
cargo install wasm-bindgen-cli cargo install wasm-bindgen-cli
rustup target add wasm32-unknown-unknown rustup target add wasm32-unknown-unknown
wget https://github.com/emscripten-core/emsdk/archive/master.zip wget https://github.com/emscripten-core/emsdk/archive/master.zip
@ -32,6 +33,7 @@ jobs:
./emsdk-master/emsdk activate latest ./emsdk-master/emsdk activate latest
script: script:
- | - |
set -e
source emsdk-master/emsdk_env.sh source emsdk-master/emsdk_env.sh
cd matrix_sdk/examples/wasm_command_bot cd matrix_sdk/examples/wasm_command_bot
cargo build --target wasm32-unknown-unknown cargo build --target wasm32-unknown-unknown

View File

@ -44,6 +44,7 @@ use crate::Endpoint;
use crate::identifiers::DeviceId; use crate::identifiers::DeviceId;
use crate::api; use crate::api;
#[cfg(not(target_arch = "wasm32"))]
use crate::VERSION; use crate::VERSION;
use crate::{Error, EventEmitter, Result}; use crate::{Error, EventEmitter, Result};
use matrix_sdk_base::BaseClient; use matrix_sdk_base::BaseClient;

View File

@ -53,4 +53,5 @@ pub use client::{Client, ClientConfig, SyncSettings};
pub use error::{Error, Result}; pub use error::{Error, Result};
pub use request_builder::{MessagesRequestBuilder, RoomBuilder}; pub use request_builder::{MessagesRequestBuilder, RoomBuilder};
#[cfg(not(target_arch = "wasm32"))]
pub(crate) const VERSION: &str = env!("CARGO_PKG_VERSION"); pub(crate) const VERSION: &str = env!("CARGO_PKG_VERSION");