Skip to content

Commit 9b4e0e8

Browse files
committed
update travis script
1 parent 92d878c commit 9b4e0e8

File tree

2 files changed

+19
-48
lines changed

2 files changed

+19
-48
lines changed

.travis.yml

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dist: xenial
44

55
language: rust
66

7-
rust: nightly-2019-03-05
7+
rust: nightly-2019-06-15
88

99
os:
1010
- linux
@@ -14,7 +14,7 @@ cache:
1414
cargo: true
1515
directories:
1616
- $HOME/Library/Caches/Homebrew
17-
- $TRAVIS_BUILD_DIR/qemu-3.1.0
17+
- $TRAVIS_BUILD_DIR/qemu-4.0.0
1818

1919
addons:
2020
homebrew:
@@ -36,8 +36,8 @@ matrix:
3636

3737
install:
3838
- if [ $ARCH = riscv32 ] || [ $ARCH = riscv64 ]; then
39-
[ $TRAVIS_OS_NAME = linux ] && export FILE="riscv64-unknown-elf-gcc-8.2.0-2019.02.0-x86_64-linux-ubuntu14";
40-
[ $TRAVIS_OS_NAME = osx ] && export FILE="riscv64-unknown-elf-gcc-8.2.0-2019.02.0-x86_64-apple-darwin";
39+
[ $TRAVIS_OS_NAME = linux ] && export FILE="riscv64-unknown-elf-gcc-8.2.0-2019.05.3-x86_64-linux-ubuntu14";
40+
[ $TRAVIS_OS_NAME = osx ] && export FILE="riscv64-unknown-elf-gcc-8.2.0-2019.05.3-x86_64-apple-darwin";
4141
wget https://static.dev.sifive.com/dev-tools/$FILE.tar.gz;
4242
tar xf $FILE.tar.gz;
4343
export PATH=$PATH:$PWD/$FILE/bin;
@@ -48,57 +48,28 @@ install:
4848
wget https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/$FILE.tar.xz;
4949
tar -xf $FILE.tar.xz;
5050
export PATH=$PATH:$PWD/$FILE/bin;
51-
wget https://musl.cc/aarch64-linux-musl-cross.tgz;
52-
tar -xf aarch64-linux-musl-cross.tgz;
53-
export PATH=$PATH:$PWD/aarch64-linux-musl-cross/bin;
5451
elif [ $TRAVIS_OS_NAME = osx ]; then
5552
brew tap SergioBenitez/osxct;
5653
brew install aarch64-none-elf;
5754
fi;
5855
fi
59-
- if [ $ARCH = x86_64 ]; then
60-
if [ $TRAVIS_OS_NAME = linux ]; then
61-
sudo apt update;
62-
sudo apt install linux-headers-$(uname -r);
63-
wget https://musl.cc/x86_64-linux-musl-cross.tgz;
64-
tar -xf x86_64-linux-musl-cross.tgz;
65-
export PATH=$PATH:$PWD/x86_64-linux-musl-cross/bin;
66-
fi;
67-
fi
68-
6956
- if [ $TRAVIS_OS_NAME = linux ]; then
70-
wget https://download.qemu.org/qemu-3.1.0.tar.xz && tar xJf qemu-3.1.0.tar.xz > /dev/null && cd qemu-3.1.0 && ./configure --target-list=$ARCH-softmmu && make && cd ..;
71-
export PATH=$PATH:$PWD/qemu-3.1.0/$ARCH-softmmu:$PWD/qemu-3.1.0;
57+
wget https://download.qemu.org/qemu-4.0.0.tar.xz && tar xJf qemu-4.0.0.tar.xz > /dev/null && cd qemu-4.0.0 && ./configure --target-list=$ARCH-softmmu && make && cd ..;
58+
export PATH=$PATH:$PWD/qemu-4.0.0/$ARCH-softmmu:$PWD/qemu-4.0.0;
7259
sudo apt update;
73-
sudo apt install libfuse-dev device-tree-compiler -y;
74-
fi
75-
76-
- if [ $ARCH = riscv32 ]; then
77-
if [ $TRAVIS_OS_NAME = linux ]; then
78-
sudo apt update;
79-
sudo apt install linux-headers-$(uname -r);
80-
wget https://musl.cc/riscv32-linux-musl-cross.tgz;
81-
tar -xf riscv32-linux-musl-cross.tgz;
82-
export PATH=$PATH:$PWD/riscv32-linux-musl-cross/bin;
83-
fi;
60+
sudo apt install device-tree-compiler -y;
8461
fi
85-
- if [ $ARCH = riscv64 ]; then
86-
if [ $TRAVIS_OS_NAME = linux ]; then
87-
sudo apt update;
88-
sudo apt install linux-headers-$(uname -r);
89-
wget https://musl.cc/riscv64-linux-musl-cross.tgz;
90-
tar -xf riscv64-linux-musl-cross.tgz;
91-
export PATH=$PATH:$PWD/riscv64-linux-musl-cross/bin;
92-
fi;
93-
fi
94-
- if [ $ARCH = mipsel ]; then
95-
if [ $TRAVIS_OS_NAME = linux ]; then
62+
- if [ $TRAVIS_OS_NAME = linux ]; then
63+
[ $ARCH = riscv32 ] && export FILE="riscv32-linux-musl-cross";
64+
[ $ARCH = riscv64 ] && export FILE="riscv64-linux-musl-cross";
65+
[ $ARCH = mipsel ] && export FILE="mipsel-linux-musln32-cross";
66+
[ $ARCH = aarch64 ] && export FILE="aarch64-linux-musl-cross";
67+
[ $ARCH = x86_64 ] && export FILE="x86_64-linux-musl-cross";
9668
sudo apt update;
9769
sudo apt install linux-headers-$(uname -r);
98-
wget https://musl.cc/mipsel-linux-musln32-cross.tgz;
99-
tar -xf mipsel-linux-musln32-cross.tgz;
100-
export PATH=$PATH:$PWD/mipsel-linux-musln32-cross/bin;
101-
fi;
70+
wget https://musl.cc/$FILE.tgz;
71+
tar -xf $FILE.tgz;
72+
export PATH=$PATH:$PWD/$FILE/bin;
10273
fi
10374

10475

@@ -107,7 +78,7 @@ before_script:
10778
- (test -x $HOME/.cargo/bin/cargo-objdump || cargo install cargo-binutils)
10879
- (test -x $HOME/.cargo/bin/cargo-xbuild || cargo install cargo-xbuild)
10980
- if [ $ARCH = x86_64 ]; then
110-
(test -x $HOME/.cargo/bin/bootimage || cargo install bootimage);
81+
(test -x $HOME/.cargo/bin/bootimage || cargo install bootimage --version 0.6.6);
11182
fi
11283

11384
script:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ See [Travis script](./.travis.yml) for details.
3232
```bash
3333
$ rustup component add rust-src llvm-tools-preview
3434
$ cargo install cargo-binutils
35-
$ cargo install cargo-xbuild --force
36-
$ cargo install bootimage --version 0.5.7 --force
35+
$ cargo install cargo-xbuild
36+
$ cargo install bootimage --version 0.6.6
3737
```
3838

3939
```bash

0 commit comments

Comments
 (0)