Skip to content

ci: correct tagged commit recognition #2157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenplusplus merged 1 commit into from
Mar 29, 2017
Merged

ci: correct tagged commit recognition #2157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/circle/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions system-test/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);