Skip to content

Commit

Permalink
Merge #269
Browse files Browse the repository at this point in the history
269: [v0.4.x] CI: pin to an older nightly r=korken89 a=japaric

to workaround compiletest-rs being broken on recent nightlies

this is a backport of #267 and it's required to land #265 

I'm not backporting #268  (compiletest -> trybuild) because this branch has compile-pass tests which depend on compiletest and can't be ported to trybuild

Co-authored-by: Jorge Aparicio <jorge@japaric.io>
  • Loading branch information
bors[bot] and japaric committed Nov 13, 2019
2 parents ba95550 + 79c3afa commit 4c98bcd
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions ci/install.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 4c98bcd

Please sign in to comment.