Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.5.x] uses the new trusty image for travis #6726

Merged
merged 2 commits into from Nov 16, 2016
Merged

[2.5.x] uses the new trusty image for travis #6726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a83fc21
uses the new travis image
schmitch Nov 11, 2016
07f299c
raised java_opts
schmitch Nov 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions .travis.yml
View file
Open in desktop
@@ -1,12 +1,9 @@
language: scala
# Trusty VM has 1.8u101
# https://github.com/travis-ci/travis-ci/issues/3259#issuecomment-243534696
dist: trusty
sudo: false
# This is needed as long as the travis build environment is JDK 1.8.0 < u40 (at time of writing it is u31)
# Otherwise, FSpec fails due to deadlocks caused by CompletableFuture.thenCompose blocking in the trampoline
# executor.
addons:
apt:
packages:
- oracle-java8-installer
group: beta
jdk:
- oraclejdk8
env:
Expand Down
2 changes: 1 addition & 1 deletion framework/bin/build
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ TEMPLATES=$BASEDIR/templates
# There are lots of different ways to configure the memory with sbt, and not every sbt installation supports
# all of them, eg on Travis, sbt doesn't support the -mem option. But JAVA_OPTS should be standard across
# the board.
export JAVA_OPTS="-Xmx2G -Xss2M -XX:MaxMetaspaceSize=512M -XX:ReservedCodeCacheSize=192M -Dfile.encoding=UTF-8"
export JAVA_OPTS="-Xmx4G -Xms1G -Xss4M -XX:MaxMetaspaceSize=512M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8"

build() {
"$SBT" --warn "$@" | grep --line-buffered -v 'Resolving \|Generating '
Expand Down