Skip to content

Commit 0340dde

Browse files
committed
travis: Add builders without assertions
This commit adds three new builders, one OSX, one Linux, and one MSVC, which will produce "nightlies" with LLVM assertions disabled. Currently all nightly releases have LLVM assertions enabled to catch bugs before they reach the beta/stable channels. The beta/stable channels, however, do not have LLVM assertions enabled. Unfortunately though projects like Servo are stuck on nightlies for the near future at least and are also suffering very long compile times. The purpose of this commit is to provide artifacts to these projects which are not distributed through normal channels (e.g. rustup) but are provided for developers to use locally if need be. Logistically these builds will all be uploaded to `rustc-builds-alt` instead of the `rustc-builds` folder of the `rust-lang-ci` bucket. These builds will stay there forever (until cleaned out if necessary) and there are no plans to integrate this with rustup and/or the official release process.
1 parent f805144 commit 0340dde

File tree

4 files changed

+56
-1
lines changed

4 files changed

+56
-1
lines changed

.travis.yml

+30
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,20 @@ matrix:
6565
osx_image: xcode8.2
6666
install: *osx_install_sccache
6767
68+
# "alternate" deployments, these are "nightlies" but don't have assertions
69+
# turned on, they're deployed to a different location primarily for projects
70+
# which are stuck on nightly and don't want llvm assertions in the artifacts
71+
# that they use.
72+
- env: IMAGE=dist-x86-linux DEPLOY_ALT=1
73+
- env: >
74+
RUST_CHECK_TARGET=dist
75+
RUST_CONFIGURE_ARGS="--enable-extended"
76+
SRC=.
77+
DEPLOY_ALT=1
78+
os: osx
79+
osx_image: xcode8.2
80+
install: *osx_install_sccache
81+
6882
env:
6983
global:
7084
- SCCACHE_BUCKET=rust-lang-ci-sccache
@@ -125,3 +139,19 @@ deploy:
125139
on:
126140
branch: auto
127141
condition: $DEPLOY = 1
142+
143+
# this is the same as the above deployment provider except that it uploads to
144+
# a slightly different directory and has a different trigger
145+
- provider: s3
146+
bucket: rust-lang-ci
147+
skip_cleanup: true
148+
local_dir: deploy
149+
upload_dir: rustc-builds-alt
150+
acl: public_read
151+
region: us-east-1
152+
access_key_id: AKIAIPQVNYF2T3DTYIWQ
153+
secret_access_key:
154+
secure: "FBqDqOTeIPMu6v/WYPf4CFSlh9rLRZGKVtpLa5KkyuOhXRTrnEzBduEtS8/FMIxdQImvurhSvxWvqRybMOi4qoVfjMqqpHAI7uBbidbrvAcJoHNsx6BgUNVCIoH6a0UsAjTUtm6/YPIpzbHoLZXPL0GrHPMk6Mu04qVSmcYNWn4="
155+
on:
156+
branch: auto
157+
condition: $DEPLOY_ALT = 1

appveyor.yml

+22
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ environment:
6161
MINGW_DIR: mingw64
6262
DEPLOY: 1
6363

64+
# "alternate" deployment, see .travis.yml for more info
65+
- MSYS_BITS: 64
66+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended
67+
SCRIPT: python x.py dist
68+
DEPLOY_ALT: 1
69+
6470
matrix:
6571
fast_finish: true
6672

@@ -146,6 +152,22 @@ deploy:
146152
branch: auto
147153
DEPLOY: 1
148154

155+
# This provider is the same as the one above except that it has a slightly
156+
# different upload directory and a slightly different trigger
157+
- provider: S3
158+
skip_cleanup: true
159+
access_key_id: AKIAIPQVNYF2T3DTYIWQ
160+
secret_access_key:
161+
secure: +11jsUNFTQ9dq5Ad1i2+PeUJaXluFJ0zIJAXESE1dFT3Kdjku4/eDdgyjgsB6GnV
162+
bucket: rust-lang-ci
163+
set_public: true
164+
region: us-east-1
165+
artifact: /.*/
166+
folder: rustc-builds-alt
167+
on:
168+
branch: auto
169+
DEPLOY_ALT: 1
170+
149171
# init:
150172
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
151173
# on_finish:

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ exec docker \
4949
$args \
5050
--env CARGO_HOME=/cargo \
5151
--env DEPLOY=$DEPLOY \
52+
--env DEPLOY_ALT=$DEPLOY_ALT \
5253
--env LOCAL_USER_ID=`id -u` \
5354
--volume "$HOME/.cargo:/cargo" \
5455
--rm \

src/ci/run.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
3030
#
3131
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
3232
# either automatically or manually.
33-
if [ "$DEPLOY" != "" ]; then
33+
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
3434
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly"
3535
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
3636

3737
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
3838
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
39+
elif [ "$DEPLOY_ALT" != "" ]; then
40+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
3941
fi
4042
else
4143
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-debug-assertions"

0 commit comments

Comments
 (0)