Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Shanfang/SmartNote
Browse files Browse the repository at this point in the history
  • Loading branch information
Shanfang committed Nov 7, 2017
2 parents 5a32040 + 36acb20 commit 1d2111c
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 21 deletions.
37 changes: 17 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
sudo: required
dist: trusty
language: node_js
node_js:
- '4.2'
- "8.5"
os: osx

addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
- google-chrome-beta

before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
branches:
only:
- master

before_script:
- npm install -g angular-cli
- npm install -g karma
- npm install
- ng build


script:
sh build.sh

serives:
mongod


script: karma start config/karma.conf.js --single-run
notifications:
email:
on_failure: change
on_success: change
24 changes: 24 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

cd smart-note
npm install
npm install simplemde --save
npm install angular-highlightjs --save
npm install -g mocha
npm install chai
npm install supertest --save-dev


brew update
brew install mongodb
mkdir -p /data/db
sudo chown -R `id -un` /data/db

mongod &

cd server
npm install
npm run dev

cd ..

npm run start &
2 changes: 1 addition & 1 deletion smart-note/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</li>
<li>
<a routerLink="/tag" routerLinkActive="router-active">
<div class="ion-bookmark icon"></div>Tag
<div class="ion-bookmark icon"></div>Tags
</a>
</li>
<li>
Expand Down

0 comments on commit 1d2111c

Please sign in to comment.