diff options
| author | bors <bors@rust-lang.org> | 2017-03-23 12:03:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-23 12:03:39 +0000 |
| commit | 8dfc25e05e995c92a6093718198cca4bc2c85b63 (patch) | |
| tree | fbdff36efdced9c4c912851a7fa488cce1af7c74 | |
| parent | 90346eae18e83887517e096c17678a74838ff995 (diff) | |
| parent | 2727866831190406ad13613d55c5846677b7d777 (diff) | |
| download | rust-8dfc25e05e995c92a6093718198cca4bc2c85b63.tar.gz rust-8dfc25e05e995c92a6093718198cca4bc2c85b63.zip | |
Auto merge of #40605 - alexcrichton:add-stamps, r=brson
travis: Add timestamps to all build messages When debugging why builds are taking so long it's often useful to get the timestamp of all log messages as we're not always timing every tiny step of the build. I wrote a [utility] for prepending a relative timestamp from the start of a process which is now downloaded to the builders and is what we wrap the entire build invocation in. [utility]: https://github.com/alexcrichton/stamp-rs Closes #40577
| -rw-r--r-- | .travis.yml | 22 | ||||
| -rwxr-xr-x | src/ci/run.sh | 1 |
2 files changed, 14 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index b4f558099da..b16957344ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,9 @@ matrix: osx_image: xcode8.2 install: &osx_install_sccache > travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-apple-darwin && - chmod +x /usr/local/bin/sccache + chmod +x /usr/local/bin/sccache && + travis_retry curl -o /usr/local/bin/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin && + chmod +x /usr/local/bin/stamp - env: > RUST_CHECK_TARGET=check RUST_CONFIGURE_ARGS=--build=i686-apple-darwin @@ -77,9 +79,7 @@ matrix: MACOSX_STD_DEPLOYMENT_TARGET=10.7 os: osx osx_image: xcode8.2 - install: > - travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-apple-darwin && - chmod +x /usr/local/bin/sccache + install: *osx_install_sccache - env: > RUST_CHECK_TARGET=dist RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended" @@ -118,6 +118,12 @@ env: # AWS_SECRET_ACCESS_KEY=... - secure: "Pixhh0hXDqGCdOyLtGFjli3J2AtDWIpyb2btIrLe956nCBDRutRoMm6rv5DI9sFZN07Mms7VzNNvhc9wCW1y63JAm414d2Co7Ob8kWMZlz9l9t7ACHuktUiis8yr+S4Quq1Vqd6pqi7pf2J++UxC8R/uLeqVrubzr6+X7AbmEFE=" +# Note that this is overridden on OSX builders +install: > + travis_retry curl -o $HOME/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl && + chmod +x $HOME/stamp && + export PATH=$PATH:$HOME + before_script: - > echo "#### Disk usage before running script:"; @@ -129,11 +135,11 @@ script: if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then echo skipping, not a full build; elif [ "$TRAVIS_OS_NAME" = "osx" ]; then - travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' && - src/ci/run.sh; + travis_retry stamp sh -c 'git submodule deinit -f . && git submodule update --init' && + stamp src/ci/run.sh; else - travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' && - src/ci/docker/run.sh $IMAGE; + travis_retry stamp sh -c 'git submodule deinit -f . && git submodule update --init' && + stamp src/ci/docker/run.sh $IMAGE; fi after_success: diff --git a/src/ci/run.sh b/src/ci/run.sh index d8b317a46c3..6c6a49ada15 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -24,7 +24,6 @@ ci_dir=`cd $(dirname $0) && pwd` source "$ci_dir/shared.sh" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache" -RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-quiet-tests" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-openssl-static" |