Skip to content

Commit d7977f8

Browse files
nipunn1313nipunn1313
committed
Merge branch 'master' into attempt
- Fix instances of try! converting to ? syntax
2 parents 235ebde + 8b5aec1 commit d7977f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1984
-1687
lines changed

‎.travis.yml

+139-35
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,153 @@
11
language: rust
2-
rust:
3-
- stable
4-
- beta
5-
- nightly
6-
sudo: false
2+
rust: stable
3+
sudo: required
4+
dist: trusty
5+
os: linux
6+
services:
7+
- docker
8+
9+
matrix:
10+
include:
11+
# stable linux builds, tested
12+
- env: TARGET=x86_64-unknown-linux-gnu
13+
ALT=i686-unknown-linux-gnu
14+
IMAGE=dist
15+
MAKE_TARGETS="test distcheck doc install uninstall"
16+
- env: TARGET=i686-unknown-linux-gnu
17+
IMAGE=dist
18+
MAKE_TARGETS=test-unit-i686-unknown-linux-gnu
19+
CFG_DISABLE_CROSS_TESTS=1
20+
21+
# stable osx builds, tested
22+
- env: TARGET=x86_64-apple-darwin
23+
ALT=i686-apple-darwin
24+
MAKE_TARGETS="test distcheck doc install uninstall"
25+
MACOSX_DEPLOYMENT_TARGET=10.7
26+
os: osx
27+
- env: TARGET=i686-apple-darwin
28+
MAKE_TARGETS=test
29+
MACOSX_DEPLOYMENT_TARGET=10.7
30+
CFG_DISABLE_CROSS_TESTS=1
31+
os: osx
32+
install: brew uninstall openssl && brew install openssl --universal --without-test
33+
34+
# stable musl target, tested
35+
- env: TARGET=x86_64-unknown-linux-musl
36+
IMAGE=x86_64-musl
37+
CFG_DISABLE_CROSS_TESTS=1
38+
MAKE_TARGETS=test-unit-$TARGET
39+
40+
# cross compiled targets
41+
- env: TARGET=arm-unknown-linux-gnueabi
42+
IMAGE=cross
43+
- env: TARGET=arm-unknown-linux-gnueabihf
44+
IMAGE=cross
45+
- env: TARGET=armv7-unknown-linux-gnueabihf
46+
IMAGE=cross
47+
- env: TARGET=aarch64-unknown-linux-gnu
48+
IMAGE=cross
49+
- env: TARGET=i686-unknown-freebsd
50+
IMAGE=cross
51+
- env: TARGET=x86_64-unknown-freebsd
52+
IMAGE=cross
53+
- env: TARGET=x86_64-unknown-netbsd
54+
IMAGE=cross
55+
- env: TARGET=mips-unknown-linux-gnu
56+
IMAGE=cross
57+
- env: TARGET=mipsel-unknown-linux-gnu
58+
IMAGE=cross
59+
- env: TARGET=mips64-unknown-linux-gnuabi64
60+
IMAGE=cross
61+
rust: nightly
62+
- env: TARGET=mips64el-unknown-linux-gnuabi64
63+
IMAGE=cross
64+
rust: nightly
65+
- env: TARGET=s390x-unknown-linux-gnu
66+
IMAGE=cross
67+
rust: nightly
68+
- env: TARGET=powerpc-unknown-linux-gnu
69+
IMAGE=cross
70+
rust: beta
71+
- env: TARGET=powerpc64-unknown-linux-gnu
72+
IMAGE=cross
73+
rust: beta
74+
- env: TARGET=powerpc64le-unknown-linux-gnu
75+
IMAGE=cross
76+
rust: beta
77+
78+
# beta/nightly builds
79+
- env: TARGET=x86_64-unknown-linux-gnu
80+
ALT=i686-unknown-linux-gnu
81+
IMAGE=dist
82+
MAKE_TARGETS="test distcheck doc install uninstall"
83+
DEPLOY=0
84+
rust: beta
85+
- env: TARGET=x86_64-unknown-linux-gnu
86+
ALT=i686-unknown-linux-gnu
87+
IMAGE=dist
88+
MAKE_TARGETS="test distcheck doc install uninstall"
89+
DEPLOY=0
90+
rust: nightly
91+
92+
exclude:
93+
- rust: stable
94+
95+
before_script:
96+
- curl https://static.rust-lang.org/rustup.sh |
97+
sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
98+
- if [ ! -z "$ALT" ]; then
99+
curl https://static.rust-lang.org/rustup.sh |
100+
sh -s -- --add-target=$ALT --disable-sudo -y --prefix=`rustc --print sysroot`;
101+
fi
7102
script:
8-
- ./configure --prefix=$HOME/cargo-install --disable-cross-tests --disable-optimize
9-
- make
10-
- make test
11-
- make distcheck
12-
- make doc
13-
- make install
14-
- make uninstall
103+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
104+
SRC=. src/ci/run.sh $TARGET;
105+
else
106+
src/ci/docker/run.sh $IMAGE $TARGET;
107+
fi
15108
after_success: |
16109
[ $TRAVIS_BRANCH = master ] &&
17110
[ $TRAVIS_PULL_REQUEST = false ] &&
18111
[ $(uname -s) = Linux ] &&
19112
pip install ghp-import --user $USER &&
20113
$HOME/.local/bin/ghp-import -n target/doc &&
21-
git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
114+
git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
115+
22116
env:
23117
global:
24-
# apparently we use too much memory and if there's more than one rustc then
25-
# when compiling Cargo's unit tests some compilers will be randomly kill
26-
# -9'd
27-
- CARGOFLAGS=-j1
28-
- secure: scGpeetUfba5RWyuS4yt10bPoFAI9wpHEReIFqEx7eH5vr2Anajk6+70jW6GdrWVdUvdINiArlQ3An2DeB9vEUWcBjw8WvuPtOH0tDMoSsuVloPlFD8yn1Ac0Bx9getAO5ofxqtoNg+OV4MDVuGabEesqAOWqURNrBC7XK+ntC8=
118+
- DEPLOY=1
119+
- secure: LB2o9UL90Z4CVOLVQsTbZr7ZBLA1dCLxFODuCkPkbdqG3Kl5z1yMIPMRvSbjp9KwBlIgm+Mg0R1iqphKVq+rVP5zo96K4+kEQMG+zWsPb23ZKTxiL8MK5VgCZ7s9AONCvNeCTCNAG3EyeciFr5Zr9eygVCfo0WF6JsPujYYQZx0=
29120

30-
matrix:
31-
include:
32-
- os: osx
33-
rust: stable
34-
before_install:
35-
- export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
36-
- export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib
121+
notifications:
122+
email:
123+
on_success: never
37124

38125
branches:
39126
only:
40-
- master
41-
42-
addons:
43-
apt:
44-
sources:
45-
- kalakris-cmake
46-
packages:
47-
- cmake
48-
- g++-multilib
49-
- lib32stdc++6
127+
- master
128+
- auto-cargo
129+
130+
before_deploy:
131+
- mkdir -p deploy/$TRAVIS_COMMIT
132+
- cp target/$TARGET/release/dist/cargo-nightly-$TARGET.tar.gz
133+
deploy/$TRAVIS_COMMIT
134+
135+
deploy:
136+
- provider: s3
137+
bucket: rust-lang-cargo-dev
138+
skip_cleanup: true
139+
local_dir: deploy
140+
upload_dir: cargo-master
141+
acl: public_read
142+
region: us-west-1
143+
access_key_id: AKIAIWZDM2B2IJOWBGTA
144+
secret_access_key:
145+
secure: NB9b/MhIDiv8OtNiN/sHaFgA3xG2fa7MGuQQKJNj80ktvgByzDm5UPNyNeoYx9SmJ3jOWobgcPVaoUd2S+6XgO3bMBqm7sM/oMeE0KdqToh6+V2bKfyRF2U5fm697LEGepPIBYqMLDg4nr/dbknbKltzp6dAfJRyy22Nb721zPQ=
146+
on:
147+
branch: auto-cargo
148+
condition: $DEPLOY = 1
149+
150+
cache:
151+
directories:
152+
- $HOME/.cargo
153+
- target/openssl

0 commit comments

Comments
 (0)