Skip to content

Commit

Permalink
Merge branch '7.1.x' into 7.2.x
Browse files Browse the repository at this point in the history
* 7.1.x:
  Backporting #1258 to 7.0.x (travis speedup)
  • Loading branch information
ProGM committed Aug 24, 2016
2 parents fd6eb84 + fd7e592 commit 1d31ee5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
@@ -1,12 +1,12 @@
before_script:
- "bundle exec rake neo4j:install[$NEO4J_VERSION] --trace"
- "bin/rake neo4j:install[$NEO4J_VERSION] --trace"
- "echo 'dbms.memory.pagecache.size=1g' >> ./db/neo4j/development/conf/neo4j.conf"
- "echo 'dbms.memory.heap.max_size=1000' >> ./db/neo4j/development/conf/neo4j-wrapper.conf"
- "echo 'dbms.memory.heap.initial_size=1000' >> ./db/neo4j/development/conf/neo4j-wrapper.conf"
- "bundle exec rake neo4j:start --trace"
- "bin/rake neo4j:start --trace"
- "sleep 10"
script:
- "travis_retry bundle exec rake default --trace"
- "travis_retry bin/rake default --trace"
language: ruby
cache: bundler
sudo: false
Expand All @@ -20,7 +20,7 @@ rvm:
- jruby-9.0.4.0
env:
global:
- JRUBY_OPTS="-X+O -J-Djruby.launch.inproc=false -J-Xmx1024m -J-XX:MaxPermSize=2048m"
- JRUBY_OPTS="-J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF"
matrix:
- NEO4J_VERSION=community-3.0.1
- NEO4J_VERSION=community-2.3.0
Expand Down
17 changes: 17 additions & 0 deletions bin/rake
@@ -0,0 +1,17 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
#
# This file was generated by Bundler.
#
# The application 'rake' is installed as part of a gem, and
# this file is here to facilitate running it.
#

require 'pathname'
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
Pathname.new(__FILE__).realpath)

require 'rubygems'
require 'bundler/setup'

load Gem.bin_path('rake', 'rake')

0 comments on commit 1d31ee5

Please sign in to comment.