aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Koenig2017-06-29 15:03:56 -0700
committerGitHub2017-06-29 15:03:56 -0700
commitad3c3a6fcb5bc374bd56c7dd2591fb1def1a5e1b (patch)
tree05a0440b81e3482156f796daec64ed83c15bb1c2
parent905cac96053caf4b6c87ac0b9c8addf313d1085c (diff)
parentc89ec28ea0d283f914794a474ac213093b2440df (diff)
Merge pull request #616 from freechipsproject/split-travis
Use Travis Build Stages
-rw-r--r--.run_chisel_tests.sh2
-rw-r--r--.travis.yml28
2 files changed, 18 insertions, 12 deletions
diff --git a/.run_chisel_tests.sh b/.run_chisel_tests.sh
index e61d370a..28a08b5d 100644
--- a/.run_chisel_tests.sh
+++ b/.run_chisel_tests.sh
@@ -7,5 +7,5 @@ else
mkdir -p chisel3/lib
cp utils/bin/firrtl.jar chisel3/lib
cd chisel3
- sbt clean test
+ sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 2)" clean test
fi
diff --git a/.travis.yml b/.travis.yml
index bafafa9c..9b667a72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,20 @@ env:
VERILATOR_ROOT=$INSTALL_DIR
PATH=$PATH:$VERILATOR_ROOT/bin:$TRAVIS_BUILD_DIR/utils/bin
-install:
- # Install Verilator (if not found in cache)
- - bash .install_verilator.sh
-
-script:
- # FIRRTL Tests
- - verilator --version
- - cd $TRAVIS_BUILD_DIR
- - sbt clean test assembly publish-local
- # Chisel 3 Tests
- - bash .run_chisel_tests.sh
+jobs:
+ include:
+ - stage: prepare cache-verilator
+ script:
+ - bash .install_verilator.sh
+ - verilator --version
+ - &test
+ stage: Test
+ script:
+ # FIRRTL Tests
+ - cd $TRAVIS_BUILD_DIR
+ - sbt clean test
+ - <<: *test
+ script:
+ - cd $TRAVIS_BUILD_DIR
+ - sbt clean assembly publish-local
+ - bash .run_chisel_tests.sh