@@ -20,6 +20,14 @@ set -o pipefail
2020shopt -s globstar
2121
2222
23+ # Setup GCP application default credentials
24+ if [[ $GCLOUD_SERVICE_KEY ]]; then
25+ echo " $GCLOUD_SERVICE_KEY " | \
26+ base64 --decode --ignore-garbage > " ${HOME} /google-cloud-service-key.json"
27+ export GOOGLE_APPLICATION_CREDENTIALS=" ${HOME} /google-cloud-service-key.json"
28+ fi
29+
30+
2331SKIP_TESTS=false
2432if [ -z " $GOOGLE_APPLICATION_CREDENTIALS " ] ; then
2533 SKIP_TESTS=true
2836# Finds the closest parent dir that encompasses all changed files, and has a
2937# pom.xml
3038travis_changed_files_parent () {
31- [ -z " $TRAVIS_PULL_REQUEST " ] && return 0 # If we're not in a PR, forget it
39+ # If we're not in a PR, forget it
40+ [ -z " ${TRAVIS_PULL_REQUEST-CI_PULL_REQUEST} " ] && return 0
3241
3342 (
3443 set +e
3544
36- changed=" $( git diff --name-only " $TRAVIS_COMMIT " " $TRAVIS_BRANCH " ) "
45+ changed=" $( git diff --name-only " ${ TRAVIS_COMMIT-CIRCLE_SHA1} " " ${ TRAVIS_BRANCH-CIRCLE_BRANCH} " ) "
3746 if [ $? -ne 0 ]; then
3847 # Fall back to git head
39- changed=" $( git diff --name-only " $( git rev-parse HEAD) " " $TRAVIS_BRANCH " ) "
48+ changed=" $( git diff --name-only " $( git rev-parse HEAD) " " ${ TRAVIS_BRANCH-CIRCLE_BRANCH} " ) "
4049 [ $? -ne 0 ] && return 0 # Give up. Just run everything.
4150 fi
4251
@@ -67,7 +76,8 @@ common_travis_dir="$(travis_changed_files_parent)"
6776
6877# Give Maven a bit more memory
6978export MAVEN_OPTS=' -XX:+PrintFlagsFinal -Xmx800m -Xms400m'
70- " ${TRAVIS_BUILD_DIR} " /mvnw --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | egrep -v " (^\[INFO\] Download|^\[INFO\].*skipping)"
79+ " ${TRAVIS_BUILD_DIR-$HOME / $CIRCLE_PROJECT_REPONAME } " /mvnw --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | \
80+ egrep -v " (^\[INFO\] Download|^\[INFO\].*skipping)"
7181
7282[ -z " $common_travis_dir " ] || popd
7383
0 commit comments