From eb7ae13b9c579b20b883f43dfacefcc9ef5976f4 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 6 Nov 2019 19:13:34 -0500 Subject: [PATCH 1/2] CI: pin to an older nightly to workaround compiletest-rs being broken on recent nightlies --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 563806977a..1ff258fe6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ matrix: # NOTE used to build docs on successful merges to master - env: TARGET=x86_64-unknown-linux-gnu - rust: nightly + # FIXME revert this -- compiletest-rs v0.3.25 is broken with recent nightly + rust: nightly-2019-10-31 - env: TARGET=thumbv6m-none-eabi rust: nightly From 79c3afa9b015570631d403d0e3bcb53d9039ef07 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 13 Nov 2019 15:27:19 -0500 Subject: [PATCH 2/2] install rustc-dev component --- .travis.yml | 3 +-- ci/install.sh | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ff258fe6e..563806977a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ matrix: # NOTE used to build docs on successful merges to master - env: TARGET=x86_64-unknown-linux-gnu - # FIXME revert this -- compiletest-rs v0.3.25 is broken with recent nightly - rust: nightly-2019-10-31 + rust: nightly - env: TARGET=thumbv6m-none-eabi rust: nightly diff --git a/ci/install.sh b/ci/install.sh index 9000772307..98b6bd127e 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,10 +1,13 @@ set -euxo pipefail main() { - if [ $TARGET != x86_64-unknown-linux-gnu ]; then - rustup target add $TARGET + if [ $TARGET = x86_64-unknown-linux-gnu ]; then + # needed by compiletest-rs + rustup component add rustc-dev fi + rustup target add $TARGET + mkdir qemu curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-system-arm-2.12.0 > qemu/qemu-system-arm chmod +x qemu/qemu-system-arm