1
0

Merge pull request #747 from freechipsproject/try-travis-stages

try using a new travis staging feature
This commit is contained in:
Wesley W. Terpstra 2017-05-18 14:14:54 -07:00 committed by GitHub
commit 55e8d28868
2 changed files with 27 additions and 20 deletions

View File

@ -33,13 +33,6 @@ addons:
- device-tree-compiler - device-tree-compiler
- libusb-1.0-0-dev - libusb-1.0-0-dev
env:
matrix:
- SUITE=RocketSuiteA
- SUITE=RocketSuiteB
- SUITE=RocketSuiteC
- SUITE=GroundtestSuite
- SUITE=UnittestSuite
# blacklist private branches # blacklist private branches
branches: branches:
@ -48,15 +41,28 @@ branches:
- boom - boom
- /^hurricane.*$/ - /^hurricane.*$/
install: jobs:
include:
- stage: prepare cache
script:
- make tools verilator -C regression SUITE=none - make tools verilator -C regression SUITE=none
before_install:
before_install:
- export CXX=g++-4.8 CC=gcc-4.8 - export CXX=g++-4.8 CC=gcc-4.8
before_cache:
script:
- make emulator-ndebug -C regression SUITE=$SUITE
- travis_wait 30 make emulator-regression-tests -C regression SUITE=$SUITE
before_cache:
- ls -t regression/install | tail -n+2 | sed s@^@regression/install/@ | xargs rm -rf - ls -t regression/install | tail -n+2 | sed s@^@regression/install/@ | xargs rm -rf
env: SUITE=none
- &test
stage: Test
script:
- make emulator-ndebug -C regression SUITE=$SUITE JVM_MEMORY=3G
- travis_wait 30 make emulator-regression-tests -C regression SUITE=$SUITE JVM_MEMORY=3G
env: SUITE=RocketSuiteA
- <<: *test
env: SUITE=RocketSuiteB
- <<: *test
env: SUITE=RocketSuiteC
- <<: *test
env: SUITE=GroundtestSuite
- <<: *test
env: SUITE=UnittestSuite

View File

@ -12,12 +12,13 @@ long_name = $(PROJECT).$(CONFIG)
CXX ?= g++ CXX ?= g++
CXXFLAGS := -O1 CXXFLAGS := -O1
JVM_MEMORY ?= 2G
SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar SBT ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar
SHELL := /bin/bash SHELL := /bin/bash
FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar
FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(FIRRTL_JAR) firrtl.Driver FIRRTL ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -cp $(FIRRTL_JAR) firrtl.Driver
# Build firrtl.jar and put it where chisel3 can find it. # Build firrtl.jar and put it where chisel3 can find it.
$(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala") $(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala")