Skip to content

Feature/ss/test ci #14

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
merged 7 commits into from
Jul 27, 2017
Merged

Feature/ss/test ci #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2952914
test 2
ssurabhi10 Jul 27, 2017
593ca95
Removing detached head error
ssurabhi10 Jul 27, 2017
f08d874
Merge branch 'develop' into feature/ss/test-ci
ssurabhi10 Jul 27, 2017
df89006
Merge branch 'develop' into feature/ss/test-ci
ssurabhi10 Jul 27, 2017
0f5c989
test 3
ssurabhi10 Jul 27, 2017
8c509bd
Merge branch 'develop' into feature/ss/test-ci
ssurabhi10 Jul 27, 2017
dbc9316
Remove yarn, add npm
ssurabhi10 Jul 27, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git:
script: cross-env NODE_ENV=test ./node_modules/.bin/mocha --ui bdd --reporter spec
--colors --compilers js:babel-core/register server/tests --recursive
after_script:
- yarn report-coverage
- npm report-coverage
before_script:
- npm install -g gulp-cli
deploy:
Expand Down
11 changes: 5 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@
"private": false,
"engines": {
"node": ">=4.8.0",
"npm": ">=2.15.11",
"yarn": ">=0.20.3"
"npm": ">=2.15.11"
},
"scripts": {
"start": "gulp serve",
"start:debug": "cross-env DEBUG=express-mongoose-es6-rest-api:* yarn start",
"start:debug": "cross-env DEBUG=express-mongoose-es6-rest-api:* npm start",
"build": "gulp",
"lint": "esw *.js server config --color",
"lint:watch": "yarn lint -- --watch",
"lint:watch": "npm lint -- --watch",
"test": "cross-env NODE_ENV=test ./node_modules/.bin/mocha --ui bdd --reporter spec --colors --compilers js:babel-core/register server/tests --recursive",
"test:watch": "yarn test -- --watch",
"test:watch": "npm test -- --watch",
"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": "yarn test:coverage && istanbul check-coverage",
"test:check-coverage": "npm test:coverage && istanbul check-coverage",
"report-coverage": "coveralls < ./coverage/lcov.info"
},
"repository": {
Expand Down
10 changes: 5 additions & 5 deletions travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ git config user.email "[email protected]"

#git remote add upstream "https://[email protected]/rust-lang/rust-by-example.git"
# git remote add upstream "https://github.com/surabhi226005/express-mongoose-es6-rest-api.git"
echo "Remote branch added"
git fetch
echo "Remote fetched"
git branch --track develop origin/develop
git branch
# echo "Remote branch added"
# git fetch
# echo "Remote fetched"
# git branch --track develop origin/develop
# git branch
git checkout develop
git pull