@@ -33,7 +33,7 @@ matrix:
33
33
- env : IMAGE=dist-powerpc64le-linux DEPLOY=1
34
34
- env : IMAGE=dist-s390x-linux DEPLOY=1
35
35
- env : IMAGE=dist-x86_64-freebsd DEPLOY=1
36
- - env : IMAGE=dist-x86_64-linux DEPLOY=1
36
+ - env : IMAGE=dist-x86_64-linux DEPLOY=1 ALLOW_TRY=1
37
37
- env : IMAGE=dist-x86_64-musl DEPLOY=1
38
38
- env : IMAGE=dist-x86_64-netbsd DEPLOY=1
39
39
- env : IMAGE=emscripten
@@ -152,8 +152,22 @@ before_script:
152
152
echo "#### Disk usage before running script:";
153
153
df -h;
154
154
du . | sort -nr | head -n100
155
+ # If we are building a pull request, do the build if $ALLOW_PR == 1
156
+ # Otherwise, do the build if we are on the auto branch, or the try branch and $ALLOW_TRY == 1
155
157
- >
156
- if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
158
+ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
159
+ if [[ "$ALLOW_PR" == "1" ]]; then
160
+ SKIP_BUILD=false;
161
+ else
162
+ SKIP_BUILD=true;
163
+ fi
164
+ elif [[ "$TRAVIS_BRANCH" == "auto" || ( "$ALLOW_TRY" == "1" && "$TRAVIS_BRANCH" == "try" ) ]]; then
165
+ SKIP_BUILD=false;
166
+ else
167
+ SKIP_BUILD=true;
168
+ fi
169
+
170
+ if [[ "$SKIP_BUILD" == true ]]; then
157
171
export RUN_SCRIPT="echo 'skipping, not a full build'";
158
172
else
159
173
RUN_SCRIPT="stamp src/ci/init_repo.sh . $HOME/rustsrc";
@@ -239,6 +253,20 @@ deploy:
239
253
branch : auto
240
254
condition : $DEPLOY = 1
241
255
256
+ - provider : s3
257
+ bucket : rust-lang-ci
258
+ skip_cleanup : true
259
+ local_dir : deploy
260
+ upload_dir : rustc-builds-try
261
+ acl : public_read
262
+ region : us-east-1
263
+ access_key_id : AKIAIPQVNYF2T3DTYIWQ
264
+ secret_access_key :
265
+ secure : " FBqDqOTeIPMu6v/WYPf4CFSlh9rLRZGKVtpLa5KkyuOhXRTrnEzBduEtS8/FMIxdQImvurhSvxWvqRybMOi4qoVfjMqqpHAI7uBbidbrvAcJoHNsx6BgUNVCIoH6a0UsAjTUtm6/YPIpzbHoLZXPL0GrHPMk6Mu04qVSmcYNWn4="
266
+ on :
267
+ branch : try
268
+ condition : $DEPLOY = 1 && $ALLOW_TRY = 1
269
+
242
270
# this is the same as the above deployment provider except that it uploads to
243
271
# a slightly different directory and has a different trigger
244
272
- provider : s3
0 commit comments