From 9a55bc102786197879013b017cb851e23e59971e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 23 Mar 2017 08:09:00 -0700
Subject: [PATCH] Get CI working again
A few changes have necessitated some updates on our end
---
.travis.yml | 19 +++++++++----------
appveyor.yml | 2 +-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 93236a8d..22d86e03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ dist: trusty
services:
- docker
install:
- - curl https://static.rust-lang.org/rustup.sh |
- sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
+ - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
script:
- cargo build
- cargo build --no-default-features
@@ -24,26 +23,26 @@ matrix:
include:
# 1.0.0 compat
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: 1.0.0
script: cargo build
install:
# build documentation
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: nightly
script: sh ci/dox.sh
# stable compat
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: stable
- os: linux
env: TARGET=i686-unknown-linux-gnu
rust: stable
- os: osx
- env: TARGET=x86_64-apple-darwin
+ env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: stable
- os: osx
env: TARGET=i686-apple-darwin
@@ -101,18 +100,18 @@ matrix:
# beta
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: beta
- os: osx
- env: TARGET=x86_64-apple-darwin
+ env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: beta
# nightly
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: nightly
- os: osx
- env: TARGET=x86_64-apple-darwin
+ env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: nightly
# QEMU based targets that compile in an emulator
diff --git a/appveyor.yml b/appveyor.yml
index a851bb87..403682aa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
- TARGET: x86_64-pc-windows-msvc
- TARGET: i686-pc-windows-msvc
install:
- - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+ - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init.exe -y --default-host %TARGET%
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
--
GitLab