-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #37730 - eddyb:rollup, r=eddyb
Rollup of 30 pull requests - Successful merges: #37190, #37368, #37481, #37503, #37527, #37535, #37551, #37584, #37600, #37613, #37615, #37659, #37662, #37669, #37682, #37688, #37690, #37692, #37693, #37694, #37695, #37696, #37698, #37699, #37705, #37708, #37709, #37716, #37724, #37727 - Failed merges: #37640, #37689, #37717
- Loading branch information
Showing
148 changed files
with
4,927 additions
and
1,078 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,82 @@ | ||
| language: generic | ||
| language: rust | ||
| sudo: required | ||
| dist: trusty | ||
| services: | ||
| - docker | ||
|
|
||
| # LLVM takes awhile to check out and otherwise we'll manage the submodules in | ||
| # our configure script, so disable auto submodule management. | ||
| git: | ||
| submodules: false | ||
| depth: 1 | ||
| submodules: false | ||
|
|
||
| before_install: | ||
| - docker build -t rust -f src/etc/Dockerfile src/etc | ||
| matrix: | ||
| include: | ||
| # Linux builders, all docker images | ||
| - env: IMAGE=arm-android | ||
| - env: IMAGE=cross | ||
| - env: IMAGE=i686-gnu | ||
| - env: IMAGE=i686-gnu-nopt | ||
| - env: IMAGE=x86_64-freebsd | ||
| - env: IMAGE=x86_64-gnu | ||
| - env: IMAGE=x86_64-gnu-cargotest | ||
| - env: IMAGE=x86_64-gnu-debug | ||
| - env: IMAGE=x86_64-gnu-nopt | ||
| - env: IMAGE=x86_64-gnu-rustbuild | ||
| - env: IMAGE=x86_64-gnu-llvm-3.7 ALLOW_PR=1 | ||
| - env: IMAGE=x86_64-musl | ||
|
|
||
| # OSX builders | ||
| - env: > | ||
| RUST_CHECK_TARGET=check | ||
| RUST_CONFIGURE_ARGS=--target=x86_64-apple-darwin | ||
| SRC=. | ||
| os: osx | ||
| install: brew install ccache | ||
| - env: > | ||
| RUST_CHECK_TARGET=check | ||
| RUST_CONFIGURE_ARGS=--target=i686-apple-darwin | ||
| SRC=. | ||
| os: osx | ||
| install: brew install ccache | ||
| - env: > | ||
| RUST_CHECK_TARGET=check | ||
| RUST_CONFIGURE_ARGS=--target=x86_64-apple-darwin --enable-rustbuild | ||
| SRC=. | ||
| os: osx | ||
| install: brew install ccache | ||
| - env: > | ||
| RUST_CHECK_TARGET= | ||
| RUST_CONFIGURE_ARGS=--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios | ||
| SRC=. | ||
| os: osx | ||
| install: brew install ccache | ||
| script: | ||
| - docker run -v `pwd`:/build rust | ||
| sh -c " | ||
| ./configure --enable-vendor --enable-rustbuild --llvm-root=/usr/lib/llvm-3.7 --enable-quiet-tests && | ||
| make tidy && | ||
| make check -j4 | ||
| " | ||
| - if [ -z "$ALLOW_PR" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then | ||
| echo skipping, not a full build; | ||
| elif [ -z "$ENABLE_AUTO" ] then | ||
| echo skipping, not quite ready yet | ||
| elif [ "$TRAVIS_OS_NAME" = "osx" ]; then | ||
| git submodule update --init; | ||
| src/ci/run.sh; | ||
| else | ||
| git submodule update --init; | ||
| src/ci/docker/run.sh $IMAGE; | ||
| fi | ||
|
|
||
| # Real testing happens on http://buildbot.rust-lang.org/ | ||
| # | ||
| # See https://github.com/rust-lang/rust-buildbot | ||
| # CONTRIBUTING.md#pull-requests | ||
| # Save tagged docker images we created and load them if they're available | ||
| before_cache: | ||
| - docker history -q rust-ci | | ||
| grep -v missing | | ||
| xargs docker save | | ||
| gzip -9 > $HOME/docker/rust-ci.tar.gz | ||
| before_install: | ||
| - zcat $HOME/docker/rust-ci.tar.gz | docker load || true | ||
|
|
||
| notifications: | ||
| email: false | ||
|
|
||
| branches: | ||
| only: | ||
| - master | ||
| cache: | ||
| directories: | ||
| - $HOME/docker | ||
| - $HOME/.ccache | ||
| - $HOME/.cargo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # armv5-unknown-linux-gnueabi configuration | ||
| CROSS_PREFIX_armv5te-unknown-linux-gnueabi=arm-linux-gnueabi- | ||
| CC_armv5te-unknown-linux-gnueabi=gcc | ||
| CXX_armv5te-unknown-linux-gnueabi=g++ | ||
| CPP_armv5te-unknown-linux-gnueabi=gcc -E | ||
| AR_armv5te-unknown-linux-gnueabi=ar | ||
| CFG_LIB_NAME_armv5te-unknown-linux-gnueabi=lib$(1).so | ||
| CFG_STATIC_LIB_NAME_armv5te-unknown-linux-gnueabi=lib$(1).a | ||
| CFG_LIB_GLOB_armv5te-unknown-linux-gnueabi=lib$(1)-*.so | ||
| CFG_LIB_DSYM_GLOB_armv5te-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM | ||
| CFG_JEMALLOC_CFLAGS_armv5te-unknown-linux-gnueabi := -D__arm__ -mfloat-abi=soft $(CFLAGS) -march=armv5te -marm | ||
| CFG_GCCISH_CFLAGS_armv5te-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfloat-abi=soft $(CFLAGS) -march=armv5te -marm | ||
| CFG_GCCISH_CXXFLAGS_armv5te-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS) | ||
| CFG_GCCISH_LINK_FLAGS_armv5te-unknown-linux-gnueabi := -shared -fPIC -g | ||
| CFG_GCCISH_DEF_FLAG_armv5te-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list= | ||
| CFG_LLC_FLAGS_armv5te-unknown-linux-gnueabi := | ||
| CFG_INSTALL_NAME_ar,-unknown-linux-gnueabi = | ||
| CFG_EXE_SUFFIX_armv5te-unknown-linux-gnueabi := | ||
| CFG_WINDOWSY_armv5te-unknown-linux-gnueabi := | ||
| CFG_UNIXY_armv5te-unknown-linux-gnueabi := 1 | ||
| CFG_LDPATH_armv5te-unknown-linux-gnueabi := | ||
| CFG_RUN_armv5te-unknown-linux-gnueabi=$(2) | ||
| CFG_RUN_TARG_armv5te-unknown-linux-gnueabi=$(call CFG_RUN_armv5te-unknown-linux-gnueabi,,$(2)) | ||
| RUSTC_FLAGS_armv5te-unknown-linux-gnueabi := | ||
| RUSTC_CROSS_FLAGS_armv5te-unknown-linux-gnueabi := | ||
| CFG_GNU_TRIPLE_armv5te-unknown-linux-gnueabi := armv5te-unknown-linux-gnueabi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.