Skip to content

Commit

Permalink
Merge pull request #165 from iLib-js/development
Browse files Browse the repository at this point in the history
Merge to master to fix the "from-scratch" build
  • Loading branch information
ehoogerbeets authored Dec 5, 2018
2 parents 42571a0 + c4db47c commit 445a6c7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ install:
# Qt
- sudo apt-get -y install qt55[QTPACKAGE]
- sudo apt-get -y install qmlscene qt5-default qtdeclarative5-dev qtbase5-dev
- rm -rf node_modules
- npm install
- export PATH=$PWD/node_modules/.bin:$PATH
- export NODE_OPTIONS="--max-old-space-size=3072"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"grunt-shell": "^2.1.0",
"grunt-text-replace": "^0.4.0",
"http-server": "^0.11.1",
"ilib-webpack-loader": "^1.0.2",
"ilib-webpack-plugin": "^1.0.2",
"ilib-webpack-loader": "^1.2.1",
"ilib-webpack-plugin": "^1.2.1",
"iso-15924": "^2.0.0",
"jsdoc2": "^2.4.0",
"nodeunit": "^0.11.0",
Expand Down

0 comments on commit 445a6c7

Please sign in to comment.