This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git

commit a1fd0246f8419d27e6d2689d80768daad2cb20d6
Author: Andy Grove <andygrov...@gmail.com>
AuthorDate: Wed Oct 2 19:09:27 2019 -0400

    ARROW-6761: [Rust] Travis build now uses the correct Rust toolchain
    
    There is a compiler bug apparently in Rust 1.40.0-nightly so we need to 
keep using 1.39.0 for now.
    
    The Travis build script was using a `RUSTUP_TOOLCHAIN=nightly` which seems 
to override the `rust-toolchain` file.
    
    Also, Travis builds the arrow subcrate individually and therefore wasn't 
picking up the `rust-toolchain` file in the root of the Rust project.
    
    Closes #5561 from andygrove/fix-travis-builds and squashes the following 
commits:
    
    8293f44b8 <Andy Grove> no need to copy rust-toolchain
    c2a209f7c <Andy Grove> preserve original behavior of testing only after 
building arrow subcrate without default features
    a65b890ec <Andy Grove> try and fix build
    b53b26a58 <Andy Grove> fix error
    81663b9ca <Andy Grove> Travis build now uses the correct Rust toolchain
    
    Authored-by: Andy Grove <andygrov...@gmail.com>
    Signed-off-by: Paddy Horan <paddyho...@hotmail.com>
---
 .travis.yml              | 2 +-
 ci/travis_script_rust.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 534004d..a107bcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -298,7 +298,7 @@ matrix:
       - if [ $ARROW_CI_RUST_AFFECTED != "1" ]; then exit; fi
       - $TRAVIS_BUILD_DIR/ci/travis_install_cargo.sh
     script:
-      - RUSTUP_TOOLCHAIN=nightly $TRAVIS_BUILD_DIR/ci/travis_script_rust.sh
+      - $TRAVIS_BUILD_DIR/ci/travis_script_rust.sh
     before_cache:
       cargo install cargo-tarpaulin -f
     after_success:
diff --git a/ci/travis_script_rust.sh b/ci/travis_script_rust.sh
index 0f6f619..22059df 100755
--- a/ci/travis_script_rust.sh
+++ b/ci/travis_script_rust.sh
@@ -31,11 +31,16 @@ rustup show
 # raises on any formatting errors
 cargo +stable fmt --all -- --check
 
+# build entire project
 RUSTFLAGS="-D warnings" cargo build --all-targets
+
+# run tests
+cargo test
+
+# make sure we can build Arrow sub-crate without default features
 pushd arrow
 cargo build --no-default-features
 popd
-cargo test
 
 # run Arrow examples
 pushd arrow

Reply via email to