diff --git a/.travis.yml b/.travis.yml index b5142006..5ede2f08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +git: + submodules: false language: scala # run on new infrastructure sudo: false @@ -6,16 +8,6 @@ cache: directories: $HOME/.ivy2 regression/install - chisel/target - context-dependent-environments/target - groundtest/target - hardfloat/target - junctions/target - project/project/target - project/target - rocket/target - target - uncore/target # packages needed to build riscv-tools addons: @@ -60,7 +52,6 @@ branches: - hurricane before_install: - - rm riscv-tools/.travis.yml - export CXX=g++-4.8 CC=gcc-4.8 script: diff --git a/junctions b/junctions index c02574d2..f1c609d7 160000 --- a/junctions +++ b/junctions @@ -1 +1 @@ -Subproject commit c02574d2fa6710978642bce85dfda95505eb8c8a +Subproject commit f1c609d74af26bf1df4bfcc90c9db4c7c08224ff diff --git a/regression/Makefile b/regression/Makefile index ca7ddb3e..81fb6a3b 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -81,6 +81,7 @@ stamps/other-submodules.stamp: $(RISCV)/install.stamp: mkdir -p $(dir $@) git -C $(abspath $(TOP)) submodule update --init riscv-tools + rm $(abspath $(TOP))/riscv-tools/.travis.yml git -C $(abspath $(TOP))/riscv-tools submodule update --init --recursive riscv-gnu-toolchain git -C $(abspath $(TOP))/riscv-tools submodule update --init --recursive riscv-isa-sim git -C $(abspath $(TOP))/riscv-tools submodule update --init --recursive riscv-fesvr