diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-29 00:56:39 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-29 00:56:39 -0300 |
| commit | 96f31cbac82bf350db61e4b48ea95bb2706cc02b (patch) | |
| tree | 482a479a898e77f2484a48daeafae962613bd468 /.travis.yml | |
| parent | ec97bccd2346aa8c50997ec1f198a5eb6c79eab5 (diff) | |
| parent | e83babb5f88e91661bec2f1013fcb6b03612bea9 (diff) | |
| download | Kamon-96f31cbac82bf350db61e4b48ea95bb2706cc02b.tar.gz Kamon-96f31cbac82bf350db61e4b48ea95bb2706cc02b.tar.bz2 Kamon-96f31cbac82bf350db61e4b48ea95bb2706cc02b.zip | |
Merge branch 'master' into release-0.3_scala-2.11
Conflicts:
.travis.yml
project/Settings.scala
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 734b0e39..6f2df611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,8 @@ script: - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile - sbt ++$TRAVIS_SCALA_VERSION -Dakka.test.timefactor=1.5 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test scala: - - 2.11.1
\ No newline at end of file + - 2.11.1 +before_script: + - mkdir $TRAVIS_BUILD_DIR/tmp + - export SBT_OPTS="-Djava.io.tmpdir=$TRAVIS_BUILD_DIR/tmp" + |