Skip to content

Commit d07378d

Browse files
kennytmkennytm
committed
Convert the CI to debug 48116 only.
1 parent 3878906 commit d07378d

File tree

6 files changed

+25
-199
lines changed

6 files changed

+25
-199
lines changed

‎.travis.yml

+14-196
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,6 @@ git:
1111
matrix:
1212
fast_finish: true
1313
include:
14-
# Images used in testing PR and try-build should be run first.
15-
- env: IMAGE=x86_64-gnu-llvm-3.9 RUST_BACKTRACE=1
16-
if: type = pull_request OR branch = auto
17-
18-
- env: IMAGE=dist-x86_64-linux DEPLOY=1
19-
if: branch = try OR branch = auto
20-
21-
# "alternate" deployments, these are "nightlies" but have LLVM assertions
22-
# turned on, they're deployed to a different location primarily for
23-
# additional testing.
24-
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
25-
if: branch = try OR branch = auto
26-
27-
- env: >
28-
RUST_CHECK_TARGET=dist
29-
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler"
30-
SRC=.
31-
DEPLOY_ALT=1
32-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
33-
SCCACHE_ERROR_LOG=/tmp/sccache.log
34-
MACOSX_DEPLOYMENT_TARGET=10.7
35-
NO_LLVM_ASSERTIONS=1
36-
NO_DEBUG_ASSERTIONS=1
37-
os: osx
38-
osx_image: xcode7.3
39-
if: branch = auto
40-
41-
# macOS builders. These are placed near the beginning because they are very
42-
# slow to run.
43-
44-
# OSX builders running tests, these run the full test suite.
45-
#
46-
# Note that the compiler is compiled to target 10.8 here because the Xcode
47-
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
4814
- env: >
4915
RUST_CHECK_TARGET=check
5016
RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler"
@@ -55,140 +21,16 @@ matrix:
5521
MACOSX_STD_DEPLOYMENT_TARGET=10.7
5622
NO_LLVM_ASSERTIONS=1
5723
NO_DEBUG_ASSERTIONS=1
58-
os: osx
59-
osx_image: xcode8.3
60-
if: branch = auto
61-
62-
- env: >
63-
RUST_CHECK_TARGET=check
64-
RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
65-
SRC=.
66-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
67-
SCCACHE_ERROR_LOG=/tmp/sccache.log
68-
MACOSX_DEPLOYMENT_TARGET=10.8
69-
MACOSX_STD_DEPLOYMENT_TARGET=10.7
70-
NO_LLVM_ASSERTIONS=1
71-
NO_DEBUG_ASSERTIONS=1
72-
os: osx
73-
osx_image: xcode8.3
74-
if: branch = auto
75-
76-
# OSX builders producing releases. These do not run the full test suite and
77-
# just produce a bunch of artifacts.
78-
#
79-
# Note that these are running in the `xcode7` image instead of the
80-
# `xcode8.2` image as above. That's because we want to build releases for
81-
# OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
82-
- env: >
83-
RUST_CHECK_TARGET=dist
84-
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-extended --enable-profiler --enable-emscripten"
85-
SRC=.
8624
DEPLOY=1
87-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
88-
SCCACHE_ERROR_LOG=/tmp/sccache.log
89-
MACOSX_DEPLOYMENT_TARGET=10.7
90-
NO_LLVM_ASSERTIONS=1
91-
NO_DEBUG_ASSERTIONS=1
9225
os: osx
93-
osx_image: xcode7.3
94-
if: branch = auto
95-
96-
- env: >
97-
RUST_CHECK_TARGET=dist
98-
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended --enable-sanitizers --enable-profiler --enable-emscripten"
99-
SRC=.
100-
DEPLOY=1
101-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
102-
SCCACHE_ERROR_LOG=/tmp/sccache.log
103-
MACOSX_DEPLOYMENT_TARGET=10.7
104-
NO_LLVM_ASSERTIONS=1
105-
NO_DEBUG_ASSERTIONS=1
106-
os: osx
107-
osx_image: xcode7.3
108-
if: branch = auto
109-
110-
# Linux builders, remaining docker images
111-
- env: IMAGE=arm-android
112-
if: branch = auto
113-
- env: IMAGE=armhf-gnu
114-
if: branch = auto
115-
- env: IMAGE=dist-various-1 DEPLOY=1
116-
if: branch = auto
117-
- env: IMAGE=dist-various-2 DEPLOY=1
118-
if: branch = auto
119-
- env: IMAGE=dist-aarch64-linux DEPLOY=1
120-
if: branch = auto
121-
- env: IMAGE=dist-android DEPLOY=1
122-
if: branch = auto
123-
- env: IMAGE=dist-arm-linux DEPLOY=1
124-
if: branch = auto
125-
- env: IMAGE=dist-armhf-linux DEPLOY=1
126-
if: branch = auto
127-
- env: IMAGE=dist-armv7-linux DEPLOY=1
128-
if: branch = auto
129-
- env: IMAGE=dist-i586-gnu-i586-i686-musl DEPLOY=1
130-
if: branch = auto
131-
- env: IMAGE=dist-i686-freebsd DEPLOY=1
132-
if: branch = auto
133-
- env: IMAGE=dist-i686-linux DEPLOY=1
134-
if: branch = auto
135-
- env: IMAGE=dist-mips-linux DEPLOY=1
136-
if: branch = auto
137-
- env: IMAGE=dist-mips64-linux DEPLOY=1
138-
if: branch = auto
139-
- env: IMAGE=dist-mips64el-linux DEPLOY=1
140-
if: branch = auto
141-
- env: IMAGE=dist-mipsel-linux DEPLOY=1
142-
if: branch = auto
143-
- env: IMAGE=dist-powerpc-linux DEPLOY=1
144-
if: branch = auto
145-
- env: IMAGE=dist-powerpc64-linux DEPLOY=1
146-
if: branch = auto
147-
- env: IMAGE=dist-powerpc64le-linux DEPLOY=1
148-
if: branch = auto
149-
- env: IMAGE=dist-s390x-linux DEPLOY=1
150-
if: branch = auto
151-
- env: IMAGE=dist-x86_64-freebsd DEPLOY=1
152-
if: branch = auto
153-
- env: IMAGE=dist-x86_64-musl DEPLOY=1
154-
if: branch = auto
155-
- env: IMAGE=dist-x86_64-netbsd DEPLOY=1
156-
if: branch = auto
157-
- env: IMAGE=asmjs
158-
if: branch = auto
159-
- env: IMAGE=i686-gnu
160-
if: branch = auto
161-
- env: IMAGE=i686-gnu-nopt
162-
if: branch = auto
163-
- env: IMAGE=wasm32-unknown
164-
if: branch = auto
165-
- env: IMAGE=x86_64-gnu
166-
if: branch = auto
167-
- env: IMAGE=x86_64-gnu-full-bootstrap
168-
if: branch = auto
169-
- env: IMAGE=x86_64-gnu-aux
170-
if: branch = auto
171-
- env: IMAGE=x86_64-gnu-tools
172-
if: branch = auto
173-
- env: IMAGE=x86_64-gnu-debug
174-
if: branch = auto
175-
- env: IMAGE=x86_64-gnu-nopt
176-
if: branch = auto
177-
- env: IMAGE=x86_64-gnu-distcheck
178-
if: branch = auto
179-
- env: IMAGE=x86_64-gnu-incremental
180-
if: branch = auto
26+
osx_image: xcode8.3
18127
182-
- stage: publish toolstate
183-
if: branch = master AND type = push
184-
before_install: []
28+
- before_install: []
18529
install: []
18630
cache: false
18731
sudo: false
18832
script:
189-
MESSAGE_FILE=$(mktemp -t msg.XXXXXX);
190-
. src/ci/docker/x86_64-gnu-tools/repo.sh;
191-
commit_toolstate_change "$MESSAGE_FILE" "$TRAVIS_BUILD_DIR/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE"
33+
"false"
19234

19335
env:
19436
global:
@@ -201,54 +43,30 @@ env:
20143
- secure: "cFh8thThqEJLC98XKI5pfqflUzOlxsYPRW20AWRaYOOgYHPTiGWypTXiPbGSKaeAXTZoOA+DpQtEmefc0U6lt9dHc7a/MIaK6isFurjlnKYiLOeTruzyu1z7PWCeZ/jKXsU2RK/88DBtlNwfMdaMIeuKj14IVfpepPPL71ETbuk="
20244

20345
before_install:
204-
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true
20546
- mkdir -p $HOME/rustsrc
206-
# FIXME(#46924): these two commands are required to enable IPv6,
207-
# they shouldn't exist, please revert once more official solutions appeared.
208-
# see https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729
209-
- if [ "$TRAVIS_OS_NAME" = linux ]; then
210-
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json;
211-
sudo service docker restart;
212-
fi
21347

21448
install:
215-
- case "$TRAVIS_OS_NAME" in
216-
linux)
217-
travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl &&
218-
chmod +x $HOME/stamp &&
219-
export PATH=$PATH:$HOME
220-
;;
221-
osx)
222-
if [[ "$RUST_CHECK_TARGET" == dist ]]; then
223-
travis_retry brew update &&
224-
travis_retry brew install xz;
225-
fi &&
226-
travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
227-
chmod +x /usr/local/bin/sccache &&
228-
travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
229-
chmod +x /usr/local/bin/stamp
230-
;;
231-
esac
49+
- travis_retry brew update &&
50+
travis_retry brew install xz &&
51+
travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
52+
chmod +x /usr/local/bin/sccache &&
53+
travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
54+
chmod +x /usr/local/bin/stamp
23255

23356
before_script:
23457
- >
23558
echo "#### Disk usage before running script:";
23659
df -h;
23760
du . | sort -nr | head -n100
238-
- >
239-
RUN_SCRIPT="src/ci/init_repo.sh . $HOME/rustsrc";
240-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
241-
export RUN_SCRIPT="$RUN_SCRIPT && src/ci/run.sh";
242-
else
243-
export RUN_SCRIPT="$RUN_SCRIPT && src/ci/docker/run.sh $IMAGE";
244-
fi
24561
246-
# Log time information from this machine and an external machine for insight into possible
247-
# clock drift. Timezones don't matter since relative deltas give all the necessary info.
24862
script:
24963
- >
25064
date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
251-
- stamp sh -x -c "$RUN_SCRIPT"
65+
- src/ci/init_repo.sh . $HOME/rustsrc
66+
- RUST_CHECK_TARGET="check" stamp src/ci/run.sh || true
67+
- RUST_CHECK_TARGET="check" stamp src/ci/run.sh || true
68+
- RUST_CHECK_TARGET="check" stamp src/ci/run.sh || true
69+
- RUST_CHECK_TARGET="dist" stamp src/ci/run.sh
25270
- >
25371
date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
25472

‎src/bootstrap/mk/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ book:
4949
standalone-docs:
5050
$(Q)$(BOOTSTRAP) doc src/doc $(BOOTSTRAP_ARGS)
5151
check:
52-
$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
52+
$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS) src/test/compile-fail --test-args --verbose
5353
check-aux:
5454
$(Q)$(BOOTSTRAP) test \
5555
src/tools/cargo \

‎src/ci/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ else
105105
return $retval
106106
}
107107

108-
do_make tidy
109-
do_make all
108+
#do_make tidy
109+
#do_make all
110110
do_make "$RUST_CHECK_TARGET"
111111
fi

‎src/test/compile-fail/rfc-2126-extern-in-paths/single-segment.rs

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:xcrate.rs
12+
// rustc-env:RUST_LOG=info
1213

1314
#![feature(extern_in_paths)]
1415

@@ -21,3 +22,4 @@ fn main() {
2122
let s = extern::xcrate; //~ ERROR expected value, found module `extern::xcrate`
2223
//~^ NOTE not a value
2324
}
25+
//~^ ERROR should fail kthxbye

‎src/test/compile-fail/use-keyword.rs

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// Check that imports with nakes super and self don't fail during parsing
1212
// FIXME: this shouldn't fail during name resolution either
1313

14+
// rustc-env:RUST_LOG=info
15+
1416
mod a {
1517
mod b {
1618
use self as A;
@@ -25,3 +27,4 @@ mod a {
2527
}
2628

2729
fn main() {}
30+
//~^ ERROR should fail kthxbye

‎src/test/compile-fail/use-mod-2.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// rustc-env:RUST_LOG=info
12+
1113
mod foo {
1214
use self::{self};
1315
//~^ ERROR unresolved import `self` [E0432]
@@ -19,3 +21,4 @@ mod foo {
1921
}
2022

2123
fn main() {}
24+
//~^ ERROR should fail kthxbye

0 commit comments

Comments
 (0)