From 9eca4685de498f362156a2b683e0bc8ab1a5c0b6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 17 Sep 2015 00:48:36 -0700
Subject: [PATCH] Another?
---
.travis.yml | 34 ++++++++++++++++------------------
ci/run-travis.sh | 10 +++++++---
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e4c093b2..be99341a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,24 @@
language: rust
-sudo: required
-# rust:
+sudo: false
+rust:
# - 1.0.0
# - beta
-# - nightly
-services:
- - docker
+ - nightly
+# services:
+# - docker
script:
- sh ci/run-travis.sh
# os:
# - linux
# - osx
env:
- # - ARCH=i686
- # - ARCH=x86_64
-matrix:
- include:
+ matrix:
+ # - ARCH=i686
+ - ARCH=x86_64
+ global:
+ secure: Zh+dsvtjyhRKki3nA+x9FlUEszs6qswMSg1xnkihLbWjrNQhPRcfZXux2LoRbh4A7RtrlDU0Bzga9G7uuNlouALqeAqSbUVBmctjrOrWnKnhHmYQkYa8XBTR90rSn+37sLyinnGSFRIrOM5sc3dTZGlGmjNWwp+Kf8oj9T2SS7w=
+# matrix:
+# include:
# - os: linux
# env: TARGET=arm-linux-androideabi
# rust: nightly-2015-09-08
@@ -28,15 +31,10 @@ matrix:
# - os: linux
# env: TARGET=mips-unknown-linux-gnu
# rust: nightly-2015-09-08
- - os: linux
- env:
- - TARGET=DOX
- - secure: Zh+dsvtjyhRKki3nA+x9FlUEszs6qswMSg1xnkihLbWjrNQhPRcfZXux2LoRbh4A7RtrlDU0Bzga9G7uuNlouALqeAqSbUVBmctjrOrWnKnhHmYQkYa8XBTR90rSn+37sLyinnGSFRIrOM5sc3dTZGlGmjNWwp+Kf8oj9T2SS7w=
- rust: nightly
-addons:
- apt:
- packages:
- - gcc-multilib
+# addons:
+# apt:
+# packages:
+# - gcc-multilib
notifications:
email:
on_success: never
diff --git a/ci/run-travis.sh b/ci/run-travis.sh
index bb45dca8..f760306a 100644
--- a/ci/run-travis.sh
+++ b/ci/run-travis.sh
@@ -11,9 +11,7 @@ export HOST=$ARCH-$OS
MAIN_TARGETS=https://static.rust-lang.org/dist
EXTRA_TARGETS=https://people.mozilla.org/~acrichton/libc-test/2015-09-08
-if [ "$TARGET" = "DOX" ]; then
- exec sh ci/dox.sh
-elif [ "$TARGET" = "arm-linux-androideabi" ]; then
+if [ "$TARGET" = "arm-linux-androideabi" ]; then
# Pull a pre-built docker image for testing android, then run tests entirely
# within that image.
docker pull alexcrichton/rust-libc-test
@@ -54,3 +52,9 @@ fi
mkdir .cargo
cp ci/cargo-config .cargo/config
sh ci/run.sh $TARGET
+
+if [ "$TARGET" = "x86_64-unknown-linux-gnu" ] && \
+ [ "$TRAVIS_RUST_VERSION" = "nightly" ] && \
+ [ "$TRAVIS_OS_NAME" = "linux" ]; then
+ sh ci/dox.sh
+fi
--
GitLab