From e0b08966e634c0936d21714cd0e2a0d014230b9f Mon Sep 17 00:00:00 2001 From: Dmitry Ulanov Date: Mon, 26 Jun 2017 22:22:12 +0200 Subject: [PATCH 1/6] Travis doesn't build for stable and i686 architecture Try to revert back early script changes. --- .travis.yml | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd51c6de..fd3645ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,35 @@ language: rust cache: cargo rust: stable -#env: -# global: -# - TARGET=x86_64-unknown-linux-gnu +env: + global: + - TARGET=x86_64-unknown-linux-gnu matrix: include: - rust: beta - rust: nightly -# - env: TARGET=i686-unknown-linux-gnu -# addons: -# apt: -# packages: -# - gcc-multilib -# - os: osx -# env: TARGET=x86_64-apple-darwin -# - os: osx -# env: TARGET=i686-apple-darwin -# - os: osx -# rust: beta -# env: TARGET=x86_64-apple-darwin -# - os: osx -# rust: beta -# env: TARGET=i686-apple-darwin + - env: TARGET=i686-unknown-linux-gnu + addons: + apt: + packages: + - gcc-multilib + - os: osx + env: TARGET=x86_64-apple-darwin + - os: osx + env: TARGET=i686-apple-darwin + - os: osx + rust: beta + env: TARGET=x86_64-apple-darwin + - os: osx + rust: beta + env: TARGET=i686-apple-darwin allow_failures: - rust: nightly notifications: email: on_success: never before_install: -# - rustup target add $TARGET || true + - rustup target add $TARGET || true - travis_wait cargo install rustfmt --force || true before_script: - export PATH="$PATH":~/.cargo/bin @@ -43,11 +43,6 @@ script: - cargo fmt -- --verbose --write-mode=diff - cd ../emerald-cli - cargo fmt -- --verbose --write-mode=diff -# - test "$TRAVIS_RUST_VERSION" == nightly || cargo test --target=$TARGET --verbose -# - test "$TRAVIS_RUST_VERSION" != nightly || cargo test --target=$TARGET --verbose --features "dev" -# [Two different crates with name 'X' error only when using --target=](https://github.com/rust-lang/cargo/issues/3665) -# - cargo build --target=$TARGET --verbose --release - - test "$TRAVIS_RUST_VERSION" == nightly || cargo test --verbose - - test "$TRAVIS_RUST_VERSION" != nightly || cargo test --verbose --features "dev" - - cargo build --verbose --release - - cargo doc --no-deps + - cargo test --all --target=$TARGET --verbose + - cargo build --all --target=$TARGET --verbose --release +# - cargo doc --no-deps From bdf5913b5e5f9f2f3698759a2d566e0b7bc9e89a Mon Sep 17 00:00:00 2001 From: Dmitry Ulanov Date: Mon, 26 Jun 2017 23:10:39 +0200 Subject: [PATCH 2/6] `TARGET` cross-compiling doesn't work on vanilla Travis Ignore building on `i686`, because Appveyor cover that case. --- .travis.yml | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd3645ae..2b1499b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,12 @@ language: rust cache: cargo -rust: stable -env: - global: - - TARGET=x86_64-unknown-linux-gnu -matrix: - include: - - rust: beta - - rust: nightly - - env: TARGET=i686-unknown-linux-gnu - addons: - apt: - packages: - - gcc-multilib - - os: osx - env: TARGET=x86_64-apple-darwin - - os: osx - env: TARGET=i686-apple-darwin - - os: osx - rust: beta - env: TARGET=x86_64-apple-darwin - - os: osx - rust: beta - env: TARGET=i686-apple-darwin - allow_failures: - - rust: nightly +rust: + - stable + - beta + - nightly +os: + - linux + - osx notifications: email: on_success: never @@ -45,4 +27,3 @@ script: - cargo fmt -- --verbose --write-mode=diff - cargo test --all --target=$TARGET --verbose - cargo build --all --target=$TARGET --verbose --release -# - cargo doc --no-deps From 2548846fbd8f8195ea20eded0b455f8e9a346a5e Mon Sep 17 00:00:00 2001 From: Dmitry Ulanov Date: Mon, 26 Jun 2017 23:11:34 +0200 Subject: [PATCH 3/6] Duplication in the Travis script Remove it. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b1499b0..07dbbf6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,5 @@ script: - export RUST_BACKTRACE=1 - cd emerald-core - cargo fmt -- --verbose --write-mode=diff - - cd ../emerald-cli - - cargo fmt -- --verbose --write-mode=diff - cargo test --all --target=$TARGET --verbose - cargo build --all --target=$TARGET --verbose --release From b798788eaecf35a0a2282a958465a74b46592f1b Mon Sep 17 00:00:00 2001 From: Dmitry Ulanov Date: Mon, 26 Jun 2017 23:13:25 +0200 Subject: [PATCH 4/6] Duplication in the Travis script Remove it. --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07dbbf6e..c92aba89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,17 +11,13 @@ notifications: email: on_success: never before_install: - - rustup target add $TARGET || true - travis_wait cargo install rustfmt --force || true before_script: - export PATH="$PATH":~/.cargo/bin - echo "\$ rustfmt --version" - - cd emerald-core - cargo fmt -- --version - - cd .. script: - export RUST_BACKTRACE=1 - - cd emerald-core - - cargo fmt -- --verbose --write-mode=diff + - cargo fmt --all -- --verbose --write-mode=diff - cargo test --all --target=$TARGET --verbose - cargo build --all --target=$TARGET --verbose --release From eb5730fab2c07bd61e0dda66903782c553ea03d6 Mon Sep 17 00:00:00 2001 From: Dmitry Ulanov Date: Mon, 26 Jun 2017 23:21:39 +0200 Subject: [PATCH 5/6] Duplication in the Travis script Remove it. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c92aba89..275bce5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,5 @@ before_script: script: - export RUST_BACKTRACE=1 - cargo fmt --all -- --verbose --write-mode=diff - - cargo test --all --target=$TARGET --verbose - - cargo build --all --target=$TARGET --verbose --release + - cargo test --all --verbose + - cargo build --all --verbose --release From 639c920b293634d0c11b207be0f1d7166e72c086 Mon Sep 17 00:00:00 2001 From: Dmitry Ulanov Date: Mon, 26 Jun 2017 23:36:54 +0200 Subject: [PATCH 6/6] Workspace feature brakes literally everything Fix it. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 275bce5d..4830a041 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: before_script: - export PATH="$PATH":~/.cargo/bin - echo "\$ rustfmt --version" - - cargo fmt -- --version + - cargo fmt --all -- --version script: - export RUST_BACKTRACE=1 - cargo fmt --all -- --verbose --write-mode=diff