ci: correct tagged commit recognition

stephenplusplus · stephenplusplus · commit d03fdb9a019e · 2017-03-29T13:44:04.000-04:00
diff --git a/scripts/circle/test.sh b/scripts/circle/test.sh
@@ -25,10 +25,10 @@ rebuild () {
   done
 }
 
-if [ "${CIRCLE_BRANCH}" == "master" ] &&
-   ([ "${CI_PULL_REQUEST}" == "" ] || [ "${CIRCLE_TAG}" != "" ])
+if [ "${CIRCLE_TAG}" != "" ] ||
+   ([ "${CIRCLE_BRANCH}" == "master" ] && [ "${CI_PULL_REQUEST}" == "" ])
 then
-  # This is a push to master, so system tests will be run.
+  # This is a tagged build or a push to master, so system tests will be run.
   echo $GCLOUD_TESTS_KEY | base64 --decode > ${HOME}/key.json
   export GCLOUD_TESTS_KEY="$HOME/key.json"
 fi
diff --git a/system-test/env.js b/system-test/env.js
@@ -20,6 +20,3 @@ module.exports = {
   projectId: process.env.GCLOUD_TESTS_PROJECT_ID,
   keyFilename: process.env.GCLOUD_TESTS_KEY
 };
-
-console.log('google-cloud-node configuration');
-console.log(module.exports);
