Skip to content

Commit c1452a6

Browse files
authored
ABitMore (#526)
* Give Maven a bit more memory * Move how we set things. * Add Java8-master to allowed builds 1. add java8-master 2. turn SUDO on, should give us much large VM’s.
1 parent 0e43eaa commit c1452a6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
sudo: true
1516
language: java
1617
jdk:
1718
- oraclejdk8
@@ -44,8 +45,6 @@ before_install:
4445
|| true
4546
# Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
4647
- export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
47-
# Give Maven a bit more memory
48-
- export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g'
4948
# Skip the install step, since Maven will download the dependencies we need
5049
# when the test build runs.
5150
# http://stackoverflow.com/q/31945809/101923
@@ -57,3 +56,5 @@ after_success:
5756
branches:
5857
only:
5958
- master
59+
- java8-master
60+

travis.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set -x
1919
set -o pipefail
2020
shopt -s globstar
2121

22+
2223
SKIP_TESTS=false
2324
if [ -z "$GOOGLE_APPLICATION_CREDENTIALS" ] ; then
2425
SKIP_TESTS=true
@@ -64,6 +65,8 @@ common_travis_dir="$(travis_changed_files_parent)"
6465

6566
[ -z "$common_travis_dir" ] || pushd "$common_travis_dir"
6667

68+
# Give Maven a bit more memory
69+
export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g -Xms512m'
6770
./mvnw --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | egrep -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
6871

6972
[ -z "$common_travis_dir" ] || popd

0 commit comments

Comments
 (0)