Skip to content

Commit d6977c8

Browse files
committed
Auto merge of #1250 - gnzlbg:removeppc, r=gnzlbg
Do not allow rustup to fail Currently if rustup fails to download something the build will continue until that something is needed. This makes the job fail early and clearly.
2 parents 34f1c30 + 4a56c47 commit d6977c8

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

.travis.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,82 +34,98 @@ matrix:
3434
script: sh ci/build.sh
3535
stage: tools-and-build-and-tier1
3636
rust: stable
37+
install: true
3738
- name: "Build Beta Rust"
3839
script: sh ci/build.sh
3940
stage: tools-and-build-and-tier1
4041
rust: beta
42+
install: true
4143
- name: "Build Nightly Rust"
4244
script: sh ci/build.sh
4345
stage: tools-and-build-and-tier1
4446
rust: nightly
47+
install: true
4548
- name: "Build Stable Rust"
4649
script: sh ci/build.sh
4750
stage: tools-and-build-and-tier1
4851
rust: stable
4952
os: osx
5053
osx_image: xcode10
54+
install: true
5155
- name: "Build Beta Rust"
5256
script: sh ci/build.sh
5357
stage: tools-and-build-and-tier1
5458
rust: beta
5559
os: osx
5660
osx_image: xcode10
61+
install: true
5762
- name: "Build Nightly Rust"
5863
script: sh ci/build.sh
5964
stage: tools-and-build-and-tier1
6065
rust: nightly
6166
os: osx
6267
osx_image: xcode10
68+
install: true
6369
- name: "Build Stable Rust 1.13.0"
6470
script: sh ci/build.sh
6571
stage: tools-and-build-and-tier1
6672
rust: 1.13.0
73+
install: true
6774
- name: "Build Stable Rust 1.19.0"
6875
script: sh ci/build.sh
6976
stage: tools-and-build-and-tier1
7077
rust: 1.19.0
78+
install: true
7179
- name: "Build Stable Rust 1.24.0"
7280
script: sh ci/build.sh
7381
stage: tools-and-build-and-tier1
7482
rust: 1.24.0
83+
install: true
7584
- name: "Build Stable Rust 1.25.0"
7685
script: sh ci/build.sh
7786
stage: tools-and-build-and-tier1
7887
rust: 1.25.0
88+
install: true
7989
- name: "Build Stable Rust 1.30.0"
8090
script: sh ci/build.sh
8191
stage: tools-and-build-and-tier1
8292
rust: 1.30.0
93+
install: true
8394
- name: "Build Stable Rust 1.13.0"
8495
script: sh ci/build.sh
8596
stage: tools-and-build-and-tier1
8697
rust: 1.13.0
8798
os: osx
8899
osx_image: xcode10
100+
install: true
89101
- name: "Build Stable Rust 1.19.0"
90102
script: sh ci/build.sh
91103
stage: tools-and-build-and-tier1
92104
rust: 1.19.0
93105
os: osx
94106
osx_image: xcode10
107+
install: true
95108
- name: "Build Stable Rust 1.24.0"
96109
script: sh ci/build.sh
97110
stage: tools-and-build-and-tier1
98111
rust: 1.24.0
99112
os: osx
100113
osx_image: xcode10
114+
install: true
101115
- name: "Build Stable Rust 1.25.0"
102116
script: sh ci/build.sh
103117
stage: tools-and-build-and-tier1
104118
rust: 1.25.0
105119
os: osx
106120
osx_image: xcode10
121+
install: true
107122
- name: "Build Stable Rust 1.30.0"
108123
script: sh ci/build.sh
109124
stage: tools-and-build-and-tier1
110125
rust: 1.30.0
111126
os: osx
112127
osx_image: xcode10
128+
install: true
113129
- env: TARGET=i686-apple-darwin
114130
os: osx
115131
osx_image: xcode10
@@ -119,9 +135,11 @@ matrix:
119135
- env: TARGET=x86_64-apple-darwin
120136
os: osx
121137
osx_image: xcode10
138+
install: true
122139
stage: tools-and-build-and-tier1
123140
- env: TARGET=x86_64-unknown-linux-gnu
124141
stage: tools-and-build-and-tier1
142+
install: true
125143

126144
# Tier 2 targets
127145
- env: TARGET=aarch64-linux-android
@@ -174,7 +192,7 @@ matrix:
174192
- env: TARGET=asmjs-unknown-emscripten
175193
- env: TARGET=wasm32-unknown-emscripten
176194

177-
install: rustup target add $TARGET || true
195+
install: travis_retry rustup target add $TARGET
178196

179197
script:
180198
- cargo generate-lockfile --manifest-path libc-test/Cargo.toml

ci/android-install-ndk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
set -ex
1313

14-
curl --retry 5 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
14+
curl --retry 10 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
1515
unzip -q android-ndk-r15b-linux-x86_64.zip
1616

1717
case "$1" in

ci/android-install-sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -ex
1919
# which apparently magically accepts the licenses.
2020

2121
mkdir sdk
22-
curl --retry 5 https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O
22+
curl --retry 10 https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O
2323
unzip -d sdk sdk-tools-linux-3859397.zip
2424

2525
case "$1" in

0 commit comments

Comments
 (0)