Merge pull request #424 from mziccard/test-all-branches

Run tests for PRs to branches other than master
googleapis · Nov 30, 2015 · 80c7a96 · 80c7a96
2 parents a25e504 + 1830275
commit 80c7a96
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,6 @@ before_install:
 install: mvn install -DskipTests=true -Dgpg.skip=true
 script: 
 - utilities/verify.sh
-branches:
-  only:
-  - master
 after_success:
 - utilities/after_success.sh
 env:

diff --git a/utilities/verify.sh b/utilities/verify.sh
@@ -4,7 +4,7 @@ source ./utilities/integration_test_env.sh
 # This script is used by Travis-CI to run tests.
 # This script is referenced in .travis.yml.
 
-if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     # Get signing tools and API keyfile
     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
     mkdir $TRAVIS_BUILD_DIR/signing-tools