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

ABitMore #526

Merged
merged 4 commits into from
Feb 17, 2017
Merged

ABitMore #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d881f3
Give Maven a bit more memory
Feb 17, 2017
6373df1
Merge branch 'master' into aBitMore
Feb 17, 2017
920dff9
Move how we set things.
Feb 17, 2017
bd0b929
Add Java8-master to allowed builds
Feb 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

sudo: true
language: java
jdk:
- oraclejdk8
Expand Down Expand Up @@ -44,8 +45,6 @@ before_install:
|| true
# Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
- export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
# Give Maven a bit more memory
- export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g'
# Skip the install step, since Maven will download the dependencies we need
# when the test build runs.
# http://stackoverflow.com/q/31945809/101923
Expand All @@ -57,3 +56,5 @@ after_success:
branches:
only:
- master
- java8-master

3 changes: 3 additions & 0 deletions travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ set -x
set -o pipefail
shopt -s globstar


SKIP_TESTS=false
if [ -z "$GOOGLE_APPLICATION_CREDENTIALS" ] ; then
SKIP_TESTS=true
Expand Down Expand Up @@ -64,6 +65,8 @@ common_travis_dir="$(travis_changed_files_parent)"

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

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

[ -z "$common_travis_dir" ] || popd
Expand Down