Skip to content

Commit 8c70155

Browse files
committed
Merge pull request #577 from ajkannan/source-only-when-necessary
Source IT env vars only when necessary
2 parents 0556813 + bbd3aad commit 8c70155

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

utilities/after_success.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
source ./utilities/integration_test_env.sh
32

43
# This script is used by Travis-CI to publish artifacts (binary, sorce and javadoc jars) when releasing snapshots.
54
# This script is referenced in .travis.yml.
@@ -11,6 +10,7 @@ echo "Travis JDK version: " ${TRAVIS_JDK_VERSION}
1110
if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" ]; then
1211
mvn clean cobertura:cobertura coveralls:report
1312
if [ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_BRANCH}" == "master" ]; then
13+
source ./utilities/integration_test_env.sh
1414
SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
1515
if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
1616
# Deploy site if not a SNAPSHOT

utilities/verify.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/bash
2-
source ./utilities/integration_test_env.sh
3-
42
# This script is used by Travis-CI to run tests.
53
# This script is referenced in .travis.yml.
64

75
if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
6+
source ./utilities/integration_test_env.sh
87
# Get signing tools and API keyfile
98
openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d
109
mkdir $TRAVIS_BUILD_DIR/signing-tools

0 commit comments

Comments
 (0)