Skip to content

Commit c1085f1

Browse files
committed
Merge pull request #19 from pathawks/Jekyll3
Merge pull request 19
2 parents 2e2b327 + d0c2f4f commit c1085f1

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

.travis.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
language: ruby
22
script : script/cibuild
3-
rvm:
4-
- 2.2
5-
- 2.1
6-
- 2.0
7-
- 1.9.3
83
sudo: false
94
notifications:
105
email: false
116
branches:
127
only:
138
- master
9+
10+
rvm:
11+
- 2.2
12+
- 2.1
13+
- 2.0
14+
env:
15+
- ""
16+
- JEKYLL_VERSION=3.0.0.beta8
17+
- JEKYLL_VERSION=2.0
18+
matrix:
19+
include:
20+
- # GitHub Pages
21+
rvm: 2.1.1
22+
env: GH_PAGES=true
23+
- # Ruby 1.9
24+
rvm: 1.9
25+
env: JEKYLL_VERSION=2.0

Gemfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
source 'https://rubygems.org'
2-
3-
# Specify your gem's dependencies in jekyll-gist.gemspec
42
gemspec
3+
4+
if ENV["GH_PAGES"]
5+
gem "github-pages"
6+
elsif ENV["JEKYLL_VERSION"]
7+
gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
8+
end

script/cibuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#! /usr/bin/env bash
2+
set -e
23

34
bundle exec rspec

0 commit comments

Comments
 (0)