Skip to content

Commit 8dac3f1

Browse files
committed
travis: remove GCC toolchain, download prebuilt user image from github release
1 parent 73bd80b commit 8dac3f1

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

.travis.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sudo: false
22

3-
dist: xenial
3+
dist: bionic
44

55
language: rust
66

@@ -40,29 +40,14 @@ install:
4040
sudo apt update;
4141
sudo apt install device-tree-compiler -y;
4242
fi
43-
- if [ 1 ]; then
44-
[ $ARCH = riscv32 ] && export FILE="riscv32-linux-musl-cross";
45-
[ $ARCH = riscv64 ] && export FILE="riscv64-linux-musl-cross";
46-
[ $ARCH = mipsel ] && export FILE="mipsel-linux-musln32-cross";
47-
[ $ARCH = aarch64 ] && export FILE="aarch64-linux-musl-cross";
48-
[ $ARCH = x86_64 ] && export FILE="x86_64-linux-musl-cross";
49-
if [ $TRAVIS_OS_NAME = linux ]; then
50-
wget https://musl.cc/$FILE.tgz;
51-
elif [ $TRAVIS_OS_NAME = osx ]; then
52-
wget https://mac.musl.cc/$FILE.tgz;
53-
fi;
54-
tar -xf $FILE.tgz;
55-
export PATH=$PATH:$PWD/$FILE/bin;
56-
fi
57-
5843

5944
before_script:
6045
- rustup component add rust-src llvm-tools-preview
6146
- (test -x $HOME/.cargo/bin/cargo-objdump || cargo install cargo-binutils)
6247
- (test -x $HOME/.cargo/bin/cargo-xbuild || cargo install cargo-xbuild)
6348

6449
script:
65-
- cd user && make sfsimg arch=$ARCH && cd ..
50+
- cd user && make sfsimg arch=$ARCH prebuilt=1 && cd ..
6651
- cd kernel && make build arch=$ARCH $OPTS && cd ..
6752
- if [ $ARCH = riscv32 ]; then
6853
cd tests && ./test.sh && cd ..;

kernel/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ runtest: build justruntest
257257
justrun:
258258
@qemu-system-$(arch) $(qemu_opts)
259259

260-
justrunnet: build
260+
justrunnet:
261261
@sudo qemu-system-$(arch) $(qemu_opts) $(qemu_net_opts)
262262

263-
justruntest: build
263+
justruntest:
264264
@qemu-system-$(arch) $(filter-out -serial mon:stdio, $(qemu_opts)) --append $(init) -serial file:../tests/stdout -monitor null
265265

266266
debug: $(kernel) $(kernel_img)

user

0 commit comments

Comments
 (0)