@@ -20,6 +20,14 @@ set -o pipefail
20
20
shopt -s globstar
21
21
22
22
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
+
23
31
SKIP_TESTS=false
24
32
if [ -z " $GOOGLE_APPLICATION_CREDENTIALS " ] ; then
25
33
SKIP_TESTS=true
28
36
# Finds the closest parent dir that encompasses all changed files, and has a
29
37
# pom.xml
30
38
travis_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
32
41
33
42
(
34
43
set +e
35
44
36
- changed=" $( git diff --name-only " $TRAVIS_COMMIT " " $TRAVIS_BRANCH " ) "
45
+ changed=" $( git diff --name-only " ${ TRAVIS_COMMIT-CIRCLE_SHA1} " " ${ TRAVIS_BRANCH-CIRCLE_BRANCH} " ) "
37
46
if [ $? -ne 0 ]; then
38
47
# 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} " ) "
40
49
[ $? -ne 0 ] && return 0 # Give up. Just run everything.
41
50
fi
42
51
@@ -67,7 +76,8 @@ common_travis_dir="$(travis_changed_files_parent)"
67
76
68
77
# Give Maven a bit more memory
69
78
export 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)"
71
81
72
82
[ -z " $common_travis_dir " ] || popd
73
83
0 commit comments