File tree 3 files changed +18
-6
lines changed
3 files changed +18
-6
lines changed Original file line number Diff line number Diff line change 25
25
- secure : " OKulfkA5OGd/d1IhvBKzRkHQwMcWjzrzbimo7+5NhkUkWxndAzl+719TB3wWvIh1i2wXXrEXsyZkXM5FtRrHm55v1VKQ5ibjEvFg1w3NIg81iDyoLq186fLqywvxGkOAFPrsePPsBj5USd5xvhwwbrjO6L7/RK6Z8shBwOSc41s="
26
26
27
27
before_install :
28
+ - export CARGO_TARGET_DIR="$TRAVIS_BUILD_DIR/target"
28
29
- curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal
29
30
- export PATH="$HOME/.cargo/bin:$PATH"
30
31
install :
@@ -51,6 +52,15 @@ matrix:
51
52
include :
52
53
# Builds that are executed for every PR
53
54
- os : linux
55
+ # i686 toolchain could run on x86_64 system.
56
+ - os : linux
57
+ env : HOST_TOOLCHAIN=i686-unknown-linux-gnu
58
+ addons :
59
+ apt :
60
+ packages :
61
+ - gcc-multilib
62
+ - libssl-dev:i386 # openssl dev in Cargo.toml
63
+ if : branch IN (auto, try)
54
64
- os : windows
55
65
env : CARGO_INCREMENTAL=0 OS_WINDOWS=true
56
66
@@ -117,7 +127,7 @@ before_script:
117
127
SYSROOT=$(rustc --print sysroot)
118
128
case "$TRAVIS_OS_NAME" in
119
129
windows ) export PATH="${SYSROOT}/bin:${PATH}" ;;
120
- linux ) export LD_LIBRARY_PATH="${SYSROOT}/lib" ;;
130
+ linux ) export LD_LIBRARY_PATH="${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} " ;;
121
131
osx )
122
132
# See <https://github.com/nteract/nteract/issues/1523#issuecomment-301623519>
123
133
sudo mkdir -p /usr/local/lib
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
set -ex
3
3
4
- # for faster build, share target dir between subcrates
5
- CARGO_TARGET_DIR=$( pwd) /target/
6
- export CARGO_TARGET_DIR
7
-
8
4
echo " Running clippy base tests"
9
5
10
6
PATH=$PATH :./node_modules/.bin
Original file line number Diff line number Diff line change @@ -26,5 +26,11 @@ if rustc +master -Vv 2>/dev/null | grep -q "$RUST_COMMIT"; then
26
26
exit 0
27
27
fi
28
28
29
- rustup-toolchain-install-master -f -n master -c rustc-dev -- " $RUST_COMMIT "
29
+ if [[ -n " $HOST_TOOLCHAIN " ]]; then
30
+ TOOLCHAIN=(' --host' " $HOST_TOOLCHAIN " )
31
+ else
32
+ TOOLCHAIN=()
33
+ fi
34
+
35
+ rustup-toolchain-install-master -f -n master " ${TOOLCHAIN[@]} " -c rustc-dev -- " $RUST_COMMIT "
30
36
rustup override set master
You can’t perform that action at this time.
0 commit comments