From d797e29bb9b5ee8f031bc4bf4fc7011014f2845b Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Mon, 31 Aug 2015 09:49:07 -0700
Subject: [PATCH 1/2] Test against Jekyll 3

---
 .travis.yml    | 20 +++++++++++++++++---
 Gemfile        |  8 ++++++--
 script/cibuild |  4 +++-
 script/test    |  2 --
 4 files changed, 26 insertions(+), 8 deletions(-)
 delete mode 100755 script/test

diff --git a/.travis.yml b/.travis.yml
index 0110dcc..03a5c03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,23 @@
 language: ruby
+before_script: bundle update
+script: "script/cibuild"
 sudo: false
 cache: bundler
+
+matrix:
+  include:
+    - # GitHub Pages
+      rvm: 2.1.1
+      env: GH_PAGES=true
+    - # Ruby 1.9
+      rvm: 1.9
+      env: JEKYLL_VERSION=2.0
+
 rvm:
+  - 2.2
   - 2.1
   - 2.0
-  - 1.9.3
-before_script: bundle update
-script: "script/cibuild"
+env:
+  - ""
+  - JEKYLL_VERSION=3.0.0.beta8
+  - JEKYLL_VERSION=2.0
diff --git a/Gemfile b/Gemfile
index d076fcd..4296d7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in jekyll-alt-urls.gemspec
 gemspec
+
+if ENV["GH_PAGES"]
+  gem "github-pages"
+elsif ENV["JEKYLL_VERSION"]
+  gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
+end
diff --git a/script/cibuild b/script/cibuild
index e529ce1..66ab217 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,2 +1,4 @@
 #! /bin/bash
-script/test $@
+set -e
+
+bundle exec rake spec
diff --git a/script/test b/script/test
deleted file mode 100755
index 16d6f1c..0000000
--- a/script/test
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-bundle exec rake spec

From a9cd1287d4baa751b2b1a8692f2d7ed1c19ff327 Mon Sep 17 00:00:00 2001
From: Pat Hawks <pat@pathawks.com>
Date: Mon, 31 Aug 2015 22:43:54 -0700
Subject: [PATCH 2/2] Allow gh-pages to fail for now

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 03a5c03..ab05420 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,9 @@ matrix:
     - # Ruby 1.9
       rvm: 1.9
       env: JEKYLL_VERSION=2.0
+  allow_failures:
+    - env: GH_PAGES=true # Jekyll 2.4 will fail tests
+  fast_finish: true
 
 rvm:
   - 2.2