diff --git a/.travis.yml b/.travis.yml index 898866e9..dc03e5e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,22 +14,10 @@ after_script: before_script: - npm install -g gulp-cli deploy: - app: test-ci - provider: heroku + app: $APP_NAME + provider: $PROVIDER api_key: - secure: auBdU0dKRsULQaMsTFnt0Gal/YSJSQFgSz1bONqYkm+TFnSlC2W3w1BNUFAqyrUceWT90aieBRau4G9yFNUE6/MGFaxH7a2B1CYraXE2sHXQQ5+vts2mIyeMNnAWiQTiqpMjBvIVKkfLzgOdYgTgNwIZ4b6bSRqd9upCAZAbhoipFNpChSdPtKS6iAr3V7PXlHl1GOyPqURVmhi5r3snHAWk70tp5RZMEX/jSvXnQDFK+YlNyKS4LwpyS1B9UB1C+wLx5MCuijFi6l02ETD21LN3JQG800MKukG3/6Zhec2JbCzlRMMphHJk0fX2bshIpLAEuZzEd0dvOYVTJ5maMuCUijq07PTTIuTOLKCcoZFuKm+sypF9jv4lEVfQUp+dEchrfQyixJNgbuEP6qbbo00i4xzMxPMrj/l0cPI0LSSgupLS4CrrmwiVvqTx30Cr0MXY+sU2uGMNOABHVce6S7QoNv0jst9RlDd2Ab+Q+akD7/ZABGFpOE8AIADP4y9gZcoj92nn8uOpRnISgYGjdBYM9iqksTxiWqwgGWKKWXhr5Gjvc1Ql6y4LBHvtKNDHliMwGs7N9f5PLpWitY50q7NMzwuMH8mO95+WXQ1MFxFORp04p+rscTx7jr8Q+uF/SWZ20BmmmAYIyqMIvREEHKMK/s5xlT7QvrQV/ZENMKU= + secure: $TRAVIS_SECURE_API_KEY after_success: - - git config --global user.name "Surabhi Sharma" - - git config --global user.email surabhisharma.226005@gmail.com - - if [ "$TRAVIS_BRANCH" == "develop" ] ; then git add dist/ ; git checkout -b release ; git commit -m "Dist" ; git push heroku release:master ; fi - # - git add dist/ - # - git checkout -b release - # - git commit -m "Dist" - # - git push heroku release:master - # - fi - - -#- if [ "$TRAVIS_BRANCH" == "master" ] ; then npm run deploy ; else echo "Skipping after_success" ; fi -# env: -# global: -# secure: GaWCIjifcrDR1/bzRo5X5tcZXKfiulC8LcxXmzAD9nL83VNmuXZ5XE9j5Pt5uNtT9J6xDHF9OMnvknJlAKKp6ZmWGU8wQmO4nc/GZFOhZP4jv8v/v0kFFhvDN9YzuBGIl+daafCZ2Ve3wANnxb92qsHC5TsIBRcf/1QGme25tfHqaAGxL165EoecRmbFyFC2biYCj9EyYNxx3gXNB2EPL8M0aLDtXabDHWs3i38G5jZakgYoC0DqGXRubbzl6uJCylawJYoAkk09U8obs6Zv+Z/HkgbR0AjeLVuXd3cwbZkh3uXBw2llFRb/J3T30rfBPgtXDEiI/Qu+uhQSSjf9C4jWu2sVrSizk/6d2wZGlFMIW/549Bi3tSgyhb8PCllTscPGgVaSNAeoBRd3QPj6BVS5u8+DN+hpjGp3sb2IOaWL5NSDd+o8QKQrhSxe5PQDQtmIXZ9vd1Mi9WXCLJiUWSs4R3U4qzEn4b/TiIWKLUqfJg1o++xwZRuUr6GCO3VDcdGcSQOfpr4NCwsZ1QpLY1cbuQGGDzmeviMXy+l0r6wW7knqWmnQBXLcQCqTh0niFok9x4M7Nk3M9Z7vIqa3/bZc7cWUJAk4RFZ3AiO0B1Xw0wpn9cD3tLRasm4SR3HRo5sD4gMvnJY+Fsw3te3jwx7fG/C2hS28jqB9lZJzdl8= + - if [ "$TRAVIS_BRANCH" == "develop" ] ; then + if [ "$TRAVIS_PULL_REQUEST" == "false" ] ; then bash travis.sh ; fi ; fi diff --git a/package.json b/package.json index 5a30115f..59323b39 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:coverage": "cross-env NODE_ENV=test ./node_modules/.bin/istanbul cover _mocha -- --ui bdd --reporter spec --colors --compilers js:babel-core/register server/tests --recursive", "test:check-coverage": "npm test:coverage && istanbul check-coverage", "report-coverage": "coveralls < ./coverage/lcov.info", - "travis-script": "npm run lint && npm test && npm run build" + "travis-script": "if [ \"$TRAVIS_BRANCH\" = \"develop\" ] ; then npm run lint && npm test && npm run build ; else npm run lint && npm test ; fi" }, "repository": { "type": "git", diff --git a/travis.sh b/travis.sh index e69de29b..b111dc47 100644 --- a/travis.sh +++ b/travis.sh @@ -0,0 +1,19 @@ +# vi /etc/ssh/ssh_config +# i Host 192.168.0.* StrictHostKeyChecking no UserKnownHostsFile=/dev/null + +# cd ~/.ssh +# rm known_hosts +# ln -s /dev/null known_hosts + +git config --global user.name "$GIT_USER_NAME" +git config --global user.email $GIT_USER_EMAIL + +git remote rm $PROVIDER ; +git remote add $PROVIDER git@$PROVIDER.com:$PROVIDER_APP_NAME.git ; + +git add dist/ ; +git checkout -b $TRAVIS_BRANCH ; +git commit -m "$TRAVIS_COMMIT_MESSAGE" ; +git push $PROVIDER $TRAVIS_BRANCH:PROVIDER_BRANCH ; + +echo -e "yes" | ./travis.sh ; fi