Skip to content

Commit

Permalink
Merge pull request tgstation#40293 from AutomaticFrenzy/patch/node-ve…
Browse files Browse the repository at this point in the history
…rsion-bump

Bump Node version to 8, tidy tgui build scripts
  • Loading branch information
Cyberboss authored Sep 15, 2018
2 parents 1e894c0 + 9dd442c commit a9d0d3f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export RUST_G_VERSION=0.4.0
export BSQL_VERSION=v1.4.0.0

#node version
export NODE_VERSION=4
export NODE_VERSION=8
2 changes: 1 addition & 1 deletion tgui/build_assets.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
echo node.js and all dependencies must be installed for this script to work.
echo If this script fails try installing dependencies again.
REM Build minified assets
cmd /c gulp --min
node node_modules/gulp/bin/gulp.js --min
pause
12 changes: 2 additions & 10 deletions tgui/install_dependencies.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ echo node.js 5.3.0 or newer must be installed for this script to work.
echo If this script fails, try closing editors and running it again first.
echo Any warnings about optional dependencies can be safely ignored.
pause
REM Install npm-cache
cmd /c npm install npm-cache -g
REM Install Gulp
cmd /c npm install gulp-cli -g
REM Install tgui dependencies
cmd /c npm-cache install npm
REM Flatten dependency tree
cmd /c npm dedupe
REM Clean dependency tree
cmd /c npm prune
REM Install dependencies
npm ci
pause
2 changes: 1 addition & 1 deletion tools/travis/build_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
if [ "$BUILD_TOOLS" = true ];
then
md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml";
cd tgui && source ~/.nvm/nvm.sh && gulp && cd ..;
(cd tgui && source ~/.nvm/nvm.sh && npm ci && node node_modules/gulp/bin/gulp.js --min)
phpenv global 5.6
php -l tools/WebhookProcessor/github_webhook_processor.php;
php -l tools/TGUICompiler.php;
Expand Down
1 change: 0 additions & 1 deletion tools/travis/install_build_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ source dependencies.sh

if [ "$BUILD_TOOLS" = true ]; then
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 $NODE_VERSION
npm install -g gulp-cli
pip3 install --user PyYaml -q
pip3 install --user beautifulsoup4 -q
fi;
Expand Down

0 comments on commit a9d0d3f

Please sign in to comment.