summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-04-09 15:11:16 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-04-09 15:11:16 +1000
commit9a8f714dac2f02e961c2cdce98dec98c26dd9c3e (patch)
tree096fa3a481586a671f0cca4aea8cbfc85dc187d5
parent213f0f8a90872bcd07598e0e89666586d774f211 (diff)
parentb4c88b5d33d2e99c2ed78e587e4c492be6e6a22b (diff)
downloadscala-9a8f714dac2f02e961c2cdce98dec98c26dd9c3e.tar.gz
scala-9a8f714dac2f02e961c2cdce98dec98c26dd9c3e.tar.bz2
scala-9a8f714dac2f02e961c2cdce98dec98c26dd9c3e.zip
Merge pull request #4442 from retronym/topic/upgrade
Upgrade Ruby / Jekyll versions used to build the spec
-rw-r--r--.travis.yml2
-rw-r--r--Gemfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index e90fc35267..6a7ac45e3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
# based on http://www.paperplanes.de/2013/8/13/deploying-your-jekyll-blog-to-s3-with-travis-ci.html
language: ruby
rvm:
- - 1.9.3
+ - 2.2
script: bundle exec jekyll build -s spec/ -d build/spec
install: bundle install
diff --git a/Gemfile b/Gemfile
index 53924a4381..6921f792c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
# To build the spec on Travis CI
source "https://rubygems.org"
-gem "jekyll", "2.0.0.alpha.2"
+gem "jekyll", "2.5.3"
gem "rouge"
# gem 's3_website'
# gem 'redcarpet'