Skip to content

Commit 8dfc25e

Browse files
committed
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
2 parents 90346ea + 2727866 commit 8dfc25e

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.travis.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ matrix:
5353
osx_image: xcode8.2
5454
install: &osx_install_sccache >
5555
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 &&
56-
chmod +x /usr/local/bin/sccache
56+
chmod +x /usr/local/bin/sccache &&
57+
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 &&
58+
chmod +x /usr/local/bin/stamp
5759
- env: >
5860
RUST_CHECK_TARGET=check
5961
RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
@@ -77,9 +79,7 @@ matrix:
7779
MACOSX_STD_DEPLOYMENT_TARGET=10.7
7880
os: osx
7981
osx_image: xcode8.2
80-
install: >
81-
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 &&
82-
chmod +x /usr/local/bin/sccache
82+
install: *osx_install_sccache
8383
- env: >
8484
RUST_CHECK_TARGET=dist
8585
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:
118118
# AWS_SECRET_ACCESS_KEY=...
119119
- secure: "Pixhh0hXDqGCdOyLtGFjli3J2AtDWIpyb2btIrLe956nCBDRutRoMm6rv5DI9sFZN07Mms7VzNNvhc9wCW1y63JAm414d2Co7Ob8kWMZlz9l9t7ACHuktUiis8yr+S4Quq1Vqd6pqi7pf2J++UxC8R/uLeqVrubzr6+X7AbmEFE="
120120

121+
# Note that this is overridden on OSX builders
122+
install: >
123+
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 &&
124+
chmod +x $HOME/stamp &&
125+
export PATH=$PATH:$HOME
126+
121127
before_script:
122128
- >
123129
echo "#### Disk usage before running script:";
@@ -129,11 +135,11 @@ script:
129135
if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
130136
echo skipping, not a full build;
131137
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
132-
travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' &&
133-
src/ci/run.sh;
138+
travis_retry stamp sh -c 'git submodule deinit -f . && git submodule update --init' &&
139+
stamp src/ci/run.sh;
134140
else
135-
travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' &&
136-
src/ci/docker/run.sh $IMAGE;
141+
travis_retry stamp sh -c 'git submodule deinit -f . && git submodule update --init' &&
142+
stamp src/ci/docker/run.sh $IMAGE;
137143
fi
138144
139145
after_success:

src/ci/run.sh

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ ci_dir=`cd $(dirname $0) && pwd`
2424
source "$ci_dir/shared.sh"
2525

2626
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"
27-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-quiet-tests"
2827
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
2928
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps"
3029
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-openssl-static"

0 commit comments

Comments
 (0)