Skip to content

Commit

Permalink
Moved to yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
dkumor committed Mar 31, 2017
1 parent 90630d8 commit 2052da7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -22,7 +22,7 @@ env:
before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis;fi # Darwin does not have redis by default
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION #http://austinpray.com/ops/2015/09/20/change-travis-node-version.html
- npm install -g npm@'>=3.9.2' # https://github.com/travis-ci/travis-ci/issues/2076
- npm install -g yarn

# Here is the actual ConnectorDB script
install:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -14,7 +14,7 @@ build: resources bin/connectordb
# is EXTREMELY expensive (several minutes).
testbuild: bin/dep/gnatsd bin/connectordb
$(COPY) site/www bin/
cd site/app;npm run build:html
cd site/app;yarn run build:html

#Empty rule for forcing rebuilds
phony:
Expand All @@ -27,11 +27,11 @@ submodules:
git submodule update --init --recursive

app: submodules
cd site/app;npm update
cd site/app;yarn install

resources: bin
$(COPY) site/www bin/
cd site/app;npm run build
cd site/app;yarn run build


# Rule to go from source go file to binary
Expand Down

0 comments on commit 2052da7

Please sign in to comment.