From 91cfa82fcfbd976c21a6330fcae33ab65ac60303 Mon Sep 17 00:00:00 2001 From: Alejandro Andreu Date: Sat, 2 Sep 2017 16:25:15 +0100 Subject: [PATCH 1/2] Fix Travis CI integration Right now all pull requests are failing because of the current configuration at Travis CI. A basic jekyll build should be enough that the template is not fundamentally broken. --- .travis.yml | 7 +++++++ Rakefile | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 .travis.yml create mode 100644 Rakefile diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..a9c4194c374 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: ruby +cache: + - bundler +install: + - bundle install --path vendor/bundle +script: + - bundle exec rake build \ No newline at end of file diff --git a/Rakefile b/Rakefile new file mode 100644 index 00000000000..f193bed31df --- /dev/null +++ b/Rakefile @@ -0,0 +1,32 @@ +############################################################################# +# Helper functions +############################################################################# + +def with_bundler(command) + sh "bundle exec #{command}" +end + +def jekyll(command) + with_bundler "jekyll #{command}" +end + +############################################################################# +# Standard tasks +############################################################################# + +task :default => :build + +desc 'Cleanup generated files' +task :clean do + sh 'rm -rf _site' +end + +desc 'Build the site' +task build: [:clean] do + jekyll :build +end + +desc 'Serve the site locally and watch for changes' +task serve: [:clean] do + jekyll 'serve --drafts --incremental --watch' +end From 34be1c04618b56d23ea437b410e586c912f7dfc5 Mon Sep 17 00:00:00 2001 From: Alejandro Andreu Date: Sat, 2 Sep 2017 16:31:25 +0100 Subject: [PATCH 2/2] Add missing gems These are included in my fork but not here on the upstream repo. Adding them should really fix the integration with Travis CI. --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 7cd39a2dd3c..7690f0ef99d 100644 --- a/Gemfile +++ b/Gemfile @@ -5,3 +5,5 @@ gem "jekyll-sitemap" gem "jekyll-gist" gem 'jekyll-mentions' gem 'jekyll-feed' +gem 'rake' +gem 'kramdown'