From 5821dc9a874fc747e1976ea88211cf48d844459c Mon Sep 17 00:00:00 2001 From: Ruben Vereecken Date: Wed, 13 Jan 2016 14:10:26 +0100 Subject: [PATCH 1/2] Attempt at travis --- .gitignore | 3 +++ .travis.yml | 7 +++++++ Makefile | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.gitignore b/.gitignore index 858a70386..68d303b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ # bundler specific .gem .bundle + +# npm specific +node_modules diff --git a/.travis.yml b/.travis.yml index d5387571b..da7e4a835 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,13 @@ language: ruby rvm: - 2.2.2 +install: +- bundle +- . $HOME/.nvm/nvm.sh +- nvm install 5.0 +- nvm use 5.0 +- npm install tldr-lint + gemfile: - Gemfile diff --git a/Makefile b/Makefile index 8a506acbd..7ad4feaf7 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ prerequisites: @echo "TL;DR:" @echo "1. Install Ruby suitable for your system" @echo "2. Run 'gem install bundler'" + @echo "3. Install npm for your system" @echo hooks: @@ -28,9 +29,11 @@ hooks: deps: @bundle + @npm install tldr-lint @echo "OK" lint: @bundle exec mdl --style ./scripts/markdown-style.rb pages + @`pwd`/node_modules/.bin/tldr-lint ./pages .PHONY: default index setup prerequisites hooks deps lint From cdb67c81457046f15ec1e176f0f088947ba77419 Mon Sep 17 00:00:00 2001 From: Ruben Vereecken Date: Wed, 13 Jan 2016 15:27:29 +0100 Subject: [PATCH 2/2] Edited Makefile to reflect node requirement --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ad4feaf7..f254d5176 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,8 @@ prerequisites: @echo "TL;DR:" @echo "1. Install Ruby suitable for your system" @echo "2. Run 'gem install bundler'" - @echo "3. Install npm for your system" + @echo "3. Install node 5.x" + @echo "4. Install npm" @echo hooks: