Skip to content

Commit 341f453

Browse files
committed
Auto merge of #42418 - tomprince:try-deploy, r=Mark-Simulacrum
Upload linux-x86_64 artifacts on try branch. This is an experiment to explore generating artifacts for testing with cargobmomb. See rust-lang/crater#64.
2 parents 0da9721 + d2ff798 commit 341f453

File tree

1 file changed

+30
-2
lines changed

1 file changed

+30
-2
lines changed

.travis.yml

+30-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ matrix:
3333
- env: IMAGE=dist-powerpc64le-linux DEPLOY=1
3434
- env: IMAGE=dist-s390x-linux DEPLOY=1
3535
- 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
3737
- env: IMAGE=dist-x86_64-musl DEPLOY=1
3838
- env: IMAGE=dist-x86_64-netbsd DEPLOY=1
3939
- env: IMAGE=emscripten
@@ -152,8 +152,22 @@ before_script:
152152
echo "#### Disk usage before running script:";
153153
df -h;
154154
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
155157
- >
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
157171
export RUN_SCRIPT="echo 'skipping, not a full build'";
158172
else
159173
RUN_SCRIPT="stamp src/ci/init_repo.sh . $HOME/rustsrc";
@@ -239,6 +253,20 @@ deploy:
239253
branch: auto
240254
condition: $DEPLOY = 1
241255

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+
242270
# this is the same as the above deployment provider except that it uploads to
243271
# a slightly different directory and has a different trigger
244272
- provider: s3

0 commit comments

Comments
 (0)