diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-12-31 17:42:40 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-12 15:29:04 -0800 |
| commit | 318767266fece7b0c3f2965d6664b80b7aaa1613 (patch) | |
| tree | a3de1496b249b6325c800245b1301a78a50b4a03 /src/ci/docker/arm-android | |
| parent | e35717814686ea3e3d44a8f5c1c20d1cd50be82a (diff) | |
travis: Start uploading artifacts on commits
This commit starts adding the infrastructure for uploading release artifacts from AppVeyor/Travis on each commit. The idea is that eventually we'll upload a full release to AppVeyor/Travis in accordance with plans [outlined earlier]. Right now this configures Travis/Appveyor to upload all tarballs in the `dist` directory, and various images are updated to actually produce tarballs in these directories. These are nowhere near ready to be actual release artifacts, but this should allow us to play around with it and test it out. Once this commit lands we should start seeing artifacts uploaded on each commit. [outlined earlier]: https://internals.rust-lang.org/t/rust-ci-release-infrastructure-changes/4489
Diffstat (limited to 'src/ci/docker/arm-android')
| -rw-r--r-- | src/ci/docker/arm-android/Dockerfile | 7 | ||||
| -rwxr-xr-x | src/ci/docker/arm-android/start-emulator.sh | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile index a40e76839ec..e2ef8070b51 100644 --- a/src/ci/docker/arm-android/Dockerfile +++ b/src/ci/docker/arm-android/Dockerfile @@ -48,4 +48,9 @@ ENV RUST_CONFIGURE_ARGS \ --armv7-linux-androideabi-ndk=/android/ndk-arm-9 \ --i686-linux-android-ndk=/android/ndk-x86-9 \ --aarch64-linux-android-ndk=/android/ndk-aarch64 -ENV XPY_CHECK test --target arm-linux-androideabi + +# Just a smoke test in dist to see if this works for now, we should expand this +# to all the targets above eventually. +ENV SCRIPT \ + python2.7 ../x.py test --target arm-linux-androideabi && \ + python2.7 ../x.py dist --target arm-linux-androideabi diff --git a/src/ci/docker/arm-android/start-emulator.sh b/src/ci/docker/arm-android/start-emulator.sh index fcf42c1819e..24c477d87f1 100755 --- a/src/ci/docker/arm-android/start-emulator.sh +++ b/src/ci/docker/arm-android/start-emulator.sh @@ -13,5 +13,4 @@ set -ex ANDROID_EMULATOR_FORCE_32BIT=true \ nohup nohup emulator @arm-18 -no-window -partition-size 2047 \ 0<&- &>/dev/null & -adb wait-for-device exec "$@" |