You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2018/12/12 23:15:47 UTC

[1/2] buildr git commit: Travis: use "env" feature for env vars

Repository: buildr
Updated Branches:
  refs/heads/master 0d8f8aaa1 -> 6a170c621


Travis: use "env" feature for env vars

Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/2e902e11
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/2e902e11
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/2e902e11

Branch: refs/heads/master
Commit: 2e902e11125d54e0a06f50672eba82311adb7d52
Parents: 01f0824
Author: Olle Jonsson <ol...@gmail.com>
Authored: Wed Dec 12 18:41:52 2018 +0100
Committer: GitHub <no...@github.com>
Committed: Wed Dec 12 18:41:52 2018 +0100

----------------------------------------------------------------------
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/2e902e11/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c74c716..c925e8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,12 @@ git:
   depth: 10
 scala:
   - 2.11.8
+env:
+  global:
+    - JRUBY_OPTS="-J-Xmx700M"
+    - JAVA_OPTS="-Xmx700m"
 install:
   - source ci-setup.sh
-  - export JRUBY_OPTS="-J-Xmx700M"
-  - export JAVA_OPTS="-Xmx700m"
 script: bundle exec rake ci
 notifications:
   email:


[2/2] buildr git commit: Merge branch 'patch-3' of https://github.com/olleolleolle/buildr

Posted by do...@apache.org.
Merge branch 'patch-3' of https://github.com/olleolleolle/buildr


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6a170c62
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6a170c62
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6a170c62

Branch: refs/heads/master
Commit: 6a170c621c8d40f7cc0c8db6ed22bd13e7f20f8a
Parents: 0d8f8aa 2e902e1
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Dec 13 10:15:39 2018 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Dec 13 10:15:39 2018 +1100

----------------------------------------------------------------------
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------