Skip to content

Commit bfb98f7

Browse files
authored
Feature/ss/test ci 2 (#21)
* test 2 * Removing detached head error * test 3 * Remove yarn, add npm * Add yarn in slugignore file * test 4 * Add travis-script * Travis script to add prompt answer
1 parent bc20e3c commit bfb98f7

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

.travis.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,10 @@ after_script:
1414
before_script:
1515
- npm install -g gulp-cli
1616
deploy:
17-
app: test-ci
18-
provider: heroku
17+
app: $APP_NAME
18+
provider: $PROVIDER
1919
api_key:
20-
secure: auBdU0dKRsULQaMsTFnt0Gal/YSJSQFgSz1bONqYkm+TFnSlC2W3w1BNUFAqyrUceWT90aieBRau4G9yFNUE6/MGFaxH7a2B1CYraXE2sHXQQ5+vts2mIyeMNnAWiQTiqpMjBvIVKkfLzgOdYgTgNwIZ4b6bSRqd9upCAZAbhoipFNpChSdPtKS6iAr3V7PXlHl1GOyPqURVmhi5r3snHAWk70tp5RZMEX/jSvXnQDFK+YlNyKS4LwpyS1B9UB1C+wLx5MCuijFi6l02ETD21LN3JQG800MKukG3/6Zhec2JbCzlRMMphHJk0fX2bshIpLAEuZzEd0dvOYVTJ5maMuCUijq07PTTIuTOLKCcoZFuKm+sypF9jv4lEVfQUp+dEchrfQyixJNgbuEP6qbbo00i4xzMxPMrj/l0cPI0LSSgupLS4CrrmwiVvqTx30Cr0MXY+sU2uGMNOABHVce6S7QoNv0jst9RlDd2Ab+Q+akD7/ZABGFpOE8AIADP4y9gZcoj92nn8uOpRnISgYGjdBYM9iqksTxiWqwgGWKKWXhr5Gjvc1Ql6y4LBHvtKNDHliMwGs7N9f5PLpWitY50q7NMzwuMH8mO95+WXQ1MFxFORp04p+rscTx7jr8Q+uF/SWZ20BmmmAYIyqMIvREEHKMK/s5xlT7QvrQV/ZENMKU=
20+
secure: $TRAVIS_SECURE_API_KEY
2121
after_success:
22-
- git config --global user.name "Surabhi Sharma"
23-
- git config --global user.email [email protected]
24-
- if [ "$TRAVIS_BRANCH" == "develop" ] ; then git add dist/ ; git checkout -b release ; git commit -m "Dist" ; git push heroku release:master ; fi
25-
# - git add dist/
26-
# - git checkout -b release
27-
# - git commit -m "Dist"
28-
# - git push heroku release:master
29-
# - fi
30-
31-
32-
#- if [ "$TRAVIS_BRANCH" == "master" ] ; then npm run deploy ; else echo "Skipping after_success" ; fi
33-
# env:
34-
# global:
35-
# secure: GaWCIjifcrDR1/bzRo5X5tcZXKfiulC8LcxXmzAD9nL83VNmuXZ5XE9j5Pt5uNtT9J6xDHF9OMnvknJlAKKp6ZmWGU8wQmO4nc/GZFOhZP4jv8v/v0kFFhvDN9YzuBGIl+daafCZ2Ve3wANnxb92qsHC5TsIBRcf/1QGme25tfHqaAGxL165EoecRmbFyFC2biYCj9EyYNxx3gXNB2EPL8M0aLDtXabDHWs3i38G5jZakgYoC0DqGXRubbzl6uJCylawJYoAkk09U8obs6Zv+Z/HkgbR0AjeLVuXd3cwbZkh3uXBw2llFRb/J3T30rfBPgtXDEiI/Qu+uhQSSjf9C4jWu2sVrSizk/6d2wZGlFMIW/549Bi3tSgyhb8PCllTscPGgVaSNAeoBRd3QPj6BVS5u8+DN+hpjGp3sb2IOaWL5NSDd+o8QKQrhSxe5PQDQtmIXZ9vd1Mi9WXCLJiUWSs4R3U4qzEn4b/TiIWKLUqfJg1o++xwZRuUr6GCO3VDcdGcSQOfpr4NCwsZ1QpLY1cbuQGGDzmeviMXy+l0r6wW7knqWmnQBXLcQCqTh0niFok9x4M7Nk3M9Z7vIqa3/bZc7cWUJAk4RFZ3AiO0B1Xw0wpn9cD3tLRasm4SR3HRo5sD4gMvnJY+Fsw3te3jwx7fG/C2hS28jqB9lZJzdl8=
22+
- if [ "$TRAVIS_BRANCH" == "develop" ] ; then
23+
if [ "$TRAVIS_PULL_REQUEST" == "false" ] ; then bash travis.sh ; fi ; fi

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"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",
2121
"test:check-coverage": "npm test:coverage && istanbul check-coverage",
2222
"report-coverage": "coveralls < ./coverage/lcov.info",
23-
"travis-script": "npm run lint && npm test && npm run build"
23+
"travis-script": "if [ \"$TRAVIS_BRANCH\" = \"develop\" ] ; then npm run lint && npm test && npm run build ; else npm run lint && npm test ; fi"
2424
},
2525
"repository": {
2626
"type": "git",

travis.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# vi /etc/ssh/ssh_config
2+
# i Host 192.168.0.* StrictHostKeyChecking no UserKnownHostsFile=/dev/null
3+
4+
# cd ~/.ssh
5+
# rm known_hosts
6+
# ln -s /dev/null known_hosts
7+
8+
git config --global user.name "$GIT_USER_NAME"
9+
git config --global user.email $GIT_USER_EMAIL
10+
11+
git remote rm $PROVIDER ;
12+
git remote add $PROVIDER git@$PROVIDER.com:$PROVIDER_APP_NAME.git ;
13+
14+
git add dist/ ;
15+
git checkout -b $TRAVIS_BRANCH ;
16+
git commit -m "$TRAVIS_COMMIT_MESSAGE" ;
17+
git push $PROVIDER $TRAVIS_BRANCH:PROVIDER_BRANCH ;
18+
19+
echo -e "yes" | ./travis.sh ; fi

0 commit comments

Comments
 (0)