Skip to content

Commit 62374ea

Browse files
Krinkletrentmwillis
authored andcommitted
Docs: Switch to github-pages gem
To ensure local testing accurately reflects what will be published, use the github-pages gem instead of specifying our Jekyll version and plugins directly.
1 parent bf756e9 commit 62374ea

File tree

4 files changed

+240
-61
lines changed

4 files changed

+240
-61
lines changed

docs/Gemfile

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,5 @@
11
source "https://rubygems.org"
22
ruby RUBY_VERSION
33

4-
# Hello! This is where you manage which Jekyll version is used to run.
5-
# When you want to use a different version, change it below, save the
6-
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
7-
#
8-
# bundle exec jekyll serve
9-
#
10-
# This will help ensure the proper Jekyll version is running.
11-
# Happy Jekylling!
12-
gem "jekyll", "3.4.3"
13-
14-
# This is the default theme for new Jekyll sites. You may change this to anything you like.
15-
gem "minima", "~> 2.0"
16-
17-
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
18-
# uncomment the line below. To upgrade, run `bundle update github-pages`.
19-
# gem "github-pages", group: :jekyll_plugins
20-
21-
# If you have any plugins, put them here!
22-
group :jekyll_plugins do
23-
gem "jekyll-feed", "~> 0.6"
24-
gem "jekyll-redirect-from", "0.13.0"
25-
end
26-
27-
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
28-
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
29-
4+
# To upgrade, run `bundle update github-pages`.
5+
gem "github-pages", group: :jekyll_plugins

docs/Gemfile.lock

Lines changed: 222 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,251 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.1)
5-
public_suffix (~> 2.0, >= 2.0.2)
4+
activesupport (4.2.10)
5+
i18n (~> 0.7)
6+
minitest (~> 5.1)
7+
thread_safe (~> 0.3, >= 0.3.4)
8+
tzinfo (~> 1.1)
9+
addressable (2.5.2)
10+
public_suffix (>= 2.0.2, < 4.0)
11+
coffee-script (2.4.1)
12+
coffee-script-source
13+
execjs
14+
coffee-script-source (1.11.1)
615
colorator (1.1.0)
7-
ffi (1.9.18)
16+
commonmarker (0.17.13)
17+
ruby-enum (~> 0.5)
18+
concurrent-ruby (1.1.4)
19+
dnsruby (1.61.2)
20+
addressable (~> 2.5)
21+
em-websocket (0.5.1)
22+
eventmachine (>= 0.12.9)
23+
http_parser.rb (~> 0.6.0)
24+
ethon (0.11.0)
25+
ffi (>= 1.3.0)
26+
eventmachine (1.2.7)
27+
execjs (2.7.0)
28+
faraday (0.15.4)
29+
multipart-post (>= 1.2, < 3)
30+
ffi (1.9.25)
831
forwardable-extended (2.6.0)
9-
jekyll (3.4.3)
32+
gemoji (3.0.0)
33+
github-pages (193)
34+
activesupport (= 4.2.10)
35+
github-pages-health-check (= 1.8.1)
36+
jekyll (= 3.7.4)
37+
jekyll-avatar (= 0.6.0)
38+
jekyll-coffeescript (= 1.1.1)
39+
jekyll-commonmark-ghpages (= 0.1.5)
40+
jekyll-default-layout (= 0.1.4)
41+
jekyll-feed (= 0.11.0)
42+
jekyll-gist (= 1.5.0)
43+
jekyll-github-metadata (= 2.9.4)
44+
jekyll-mentions (= 1.4.1)
45+
jekyll-optional-front-matter (= 0.3.0)
46+
jekyll-paginate (= 1.1.0)
47+
jekyll-readme-index (= 0.2.0)
48+
jekyll-redirect-from (= 0.14.0)
49+
jekyll-relative-links (= 0.5.3)
50+
jekyll-remote-theme (= 0.3.1)
51+
jekyll-sass-converter (= 1.5.2)
52+
jekyll-seo-tag (= 2.5.0)
53+
jekyll-sitemap (= 1.2.0)
54+
jekyll-swiss (= 0.4.0)
55+
jekyll-theme-architect (= 0.1.1)
56+
jekyll-theme-cayman (= 0.1.1)
57+
jekyll-theme-dinky (= 0.1.1)
58+
jekyll-theme-hacker (= 0.1.1)
59+
jekyll-theme-leap-day (= 0.1.1)
60+
jekyll-theme-merlot (= 0.1.1)
61+
jekyll-theme-midnight (= 0.1.1)
62+
jekyll-theme-minimal (= 0.1.1)
63+
jekyll-theme-modernist (= 0.1.1)
64+
jekyll-theme-primer (= 0.5.3)
65+
jekyll-theme-slate (= 0.1.1)
66+
jekyll-theme-tactile (= 0.1.1)
67+
jekyll-theme-time-machine (= 0.1.1)
68+
jekyll-titles-from-headings (= 0.5.1)
69+
jemoji (= 0.10.1)
70+
kramdown (= 1.17.0)
71+
liquid (= 4.0.0)
72+
listen (= 3.1.5)
73+
mercenary (~> 0.3)
74+
minima (= 2.5.0)
75+
nokogiri (>= 1.8.2, < 2.0)
76+
rouge (= 2.2.1)
77+
terminal-table (~> 1.4)
78+
github-pages-health-check (1.8.1)
79+
addressable (~> 2.3)
80+
dnsruby (~> 1.60)
81+
octokit (~> 4.0)
82+
public_suffix (~> 2.0)
83+
typhoeus (~> 1.3)
84+
html-pipeline (2.9.1)
85+
activesupport (>= 2)
86+
nokogiri (>= 1.4)
87+
http_parser.rb (0.6.0)
88+
i18n (0.9.5)
89+
concurrent-ruby (~> 1.0)
90+
jekyll (3.7.4)
1091
addressable (~> 2.4)
1192
colorator (~> 1.0)
93+
em-websocket (~> 0.5)
94+
i18n (~> 0.7)
1295
jekyll-sass-converter (~> 1.0)
13-
jekyll-watch (~> 1.1)
14-
kramdown (~> 1.3)
15-
liquid (~> 3.0)
96+
jekyll-watch (~> 2.0)
97+
kramdown (~> 1.14)
98+
liquid (~> 4.0)
1699
mercenary (~> 0.3.3)
17100
pathutil (~> 0.9)
18-
rouge (~> 1.7)
101+
rouge (>= 1.7, < 4)
19102
safe_yaml (~> 1.0)
20-
jekyll-feed (0.9.2)
103+
jekyll-avatar (0.6.0)
104+
jekyll (~> 3.0)
105+
jekyll-coffeescript (1.1.1)
106+
coffee-script (~> 2.2)
107+
coffee-script-source (~> 1.11.1)
108+
jekyll-commonmark (1.2.0)
109+
commonmarker (~> 0.14)
110+
jekyll (>= 3.0, < 4.0)
111+
jekyll-commonmark-ghpages (0.1.5)
112+
commonmarker (~> 0.17.6)
113+
jekyll-commonmark (~> 1)
114+
rouge (~> 2)
115+
jekyll-default-layout (0.1.4)
116+
jekyll (~> 3.0)
117+
jekyll-feed (0.11.0)
21118
jekyll (~> 3.3)
22-
jekyll-redirect-from (0.13.0)
119+
jekyll-gist (1.5.0)
120+
octokit (~> 4.2)
121+
jekyll-github-metadata (2.9.4)
122+
jekyll (~> 3.1)
123+
octokit (~> 4.0, != 4.4.0)
124+
jekyll-mentions (1.4.1)
125+
html-pipeline (~> 2.3)
126+
jekyll (~> 3.0)
127+
jekyll-optional-front-matter (0.3.0)
128+
jekyll (~> 3.0)
129+
jekyll-paginate (1.1.0)
130+
jekyll-readme-index (0.2.0)
131+
jekyll (~> 3.0)
132+
jekyll-redirect-from (0.14.0)
23133
jekyll (~> 3.3)
24-
jekyll-sass-converter (1.5.0)
134+
jekyll-relative-links (0.5.3)
135+
jekyll (~> 3.3)
136+
jekyll-remote-theme (0.3.1)
137+
jekyll (~> 3.5)
138+
rubyzip (>= 1.2.1, < 3.0)
139+
jekyll-sass-converter (1.5.2)
25140
sass (~> 3.4)
26-
jekyll-watch (1.5.0)
27-
listen (~> 3.0, < 3.1)
28-
kramdown (1.13.2)
29-
liquid (3.0.6)
30-
listen (3.0.8)
141+
jekyll-seo-tag (2.5.0)
142+
jekyll (~> 3.3)
143+
jekyll-sitemap (1.2.0)
144+
jekyll (~> 3.3)
145+
jekyll-swiss (0.4.0)
146+
jekyll-theme-architect (0.1.1)
147+
jekyll (~> 3.5)
148+
jekyll-seo-tag (~> 2.0)
149+
jekyll-theme-cayman (0.1.1)
150+
jekyll (~> 3.5)
151+
jekyll-seo-tag (~> 2.0)
152+
jekyll-theme-dinky (0.1.1)
153+
jekyll (~> 3.5)
154+
jekyll-seo-tag (~> 2.0)
155+
jekyll-theme-hacker (0.1.1)
156+
jekyll (~> 3.5)
157+
jekyll-seo-tag (~> 2.0)
158+
jekyll-theme-leap-day (0.1.1)
159+
jekyll (~> 3.5)
160+
jekyll-seo-tag (~> 2.0)
161+
jekyll-theme-merlot (0.1.1)
162+
jekyll (~> 3.5)
163+
jekyll-seo-tag (~> 2.0)
164+
jekyll-theme-midnight (0.1.1)
165+
jekyll (~> 3.5)
166+
jekyll-seo-tag (~> 2.0)
167+
jekyll-theme-minimal (0.1.1)
168+
jekyll (~> 3.5)
169+
jekyll-seo-tag (~> 2.0)
170+
jekyll-theme-modernist (0.1.1)
171+
jekyll (~> 3.5)
172+
jekyll-seo-tag (~> 2.0)
173+
jekyll-theme-primer (0.5.3)
174+
jekyll (~> 3.5)
175+
jekyll-github-metadata (~> 2.9)
176+
jekyll-seo-tag (~> 2.0)
177+
jekyll-theme-slate (0.1.1)
178+
jekyll (~> 3.5)
179+
jekyll-seo-tag (~> 2.0)
180+
jekyll-theme-tactile (0.1.1)
181+
jekyll (~> 3.5)
182+
jekyll-seo-tag (~> 2.0)
183+
jekyll-theme-time-machine (0.1.1)
184+
jekyll (~> 3.5)
185+
jekyll-seo-tag (~> 2.0)
186+
jekyll-titles-from-headings (0.5.1)
187+
jekyll (~> 3.3)
188+
jekyll-watch (2.1.2)
189+
listen (~> 3.0)
190+
jemoji (0.10.1)
191+
gemoji (~> 3.0)
192+
html-pipeline (~> 2.2)
193+
jekyll (~> 3.0)
194+
kramdown (1.17.0)
195+
liquid (4.0.0)
196+
listen (3.1.5)
31197
rb-fsevent (~> 0.9, >= 0.9.4)
32198
rb-inotify (~> 0.9, >= 0.9.7)
199+
ruby_dep (~> 1.2)
33200
mercenary (0.3.6)
34-
minima (2.1.0)
35-
jekyll (~> 3.3)
36-
pathutil (0.14.0)
201+
mini_portile2 (2.3.0)
202+
minima (2.5.0)
203+
jekyll (~> 3.5)
204+
jekyll-feed (~> 0.9)
205+
jekyll-seo-tag (~> 2.1)
206+
minitest (5.11.3)
207+
multipart-post (2.0.0)
208+
nokogiri (1.8.5)
209+
mini_portile2 (~> 2.3.0)
210+
octokit (4.13.0)
211+
sawyer (~> 0.8.0, >= 0.5.3)
212+
pathutil (0.16.2)
37213
forwardable-extended (~> 2.6)
38214
public_suffix (2.0.5)
39-
rb-fsevent (0.9.8)
40-
rb-inotify (0.9.8)
41-
ffi (>= 0.5.0)
42-
rouge (1.11.1)
215+
rb-fsevent (0.10.3)
216+
rb-inotify (0.10.0)
217+
ffi (~> 1.0)
218+
rouge (2.2.1)
219+
ruby-enum (0.7.2)
220+
i18n
221+
ruby_dep (1.5.0)
222+
rubyzip (1.2.2)
43223
safe_yaml (1.0.4)
44-
sass (3.4.23)
224+
sass (3.7.2)
225+
sass-listen (~> 4.0.0)
226+
sass-listen (4.0.0)
227+
rb-fsevent (~> 0.9, >= 0.9.4)
228+
rb-inotify (~> 0.9, >= 0.9.7)
229+
sawyer (0.8.1)
230+
addressable (>= 2.3.5, < 2.6)
231+
faraday (~> 0.8, < 1.0)
232+
terminal-table (1.8.0)
233+
unicode-display_width (~> 1.1, >= 1.1.1)
234+
thread_safe (0.3.6)
235+
typhoeus (1.3.1)
236+
ethon (>= 0.9.0)
237+
tzinfo (1.2.5)
238+
thread_safe (~> 0.1)
239+
unicode-display_width (1.4.0)
45240

46241
PLATFORMS
47242
ruby
48243

49244
DEPENDENCIES
50-
jekyll (= 3.4.3)
51-
jekyll-feed (~> 0.6)
52-
jekyll-redirect-from (= 0.13.0)
53-
minima (~> 2.0)
54-
tzinfo-data
245+
github-pages
55246

56247
RUBY VERSION
57-
ruby 2.4.1p111
248+
ruby 2.5.3p105
58249

59250
BUNDLED WITH
60-
1.14.6
251+
1.17.2

docs/README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,22 @@ We're using GitHub pages. Anything going to the gh-pages branch will be immediat
66

77
### Requirements
88

9-
This is currenly tested using Jekyll and bundler gems from Ruby 2.4.1.1.
9+
* Ruby (tested with Ruby 2.4.1 and Ruby 2.5.3)
10+
* Bundler (if missing, install with `gem install bundler`)
1011

11-
To setup for the first time:
12+
To install Jekyll and plugins the first time:
1213

1314
```shell
14-
gem install jekyll bundler
1515
bundle install
1616
```
1717

18-
To run it locally:
18+
To update Jekyll and any plugins (e.g. after changes to `Gemfile`):
19+
20+
```shell
21+
bundle update
22+
```
23+
24+
To regenerate the site and serve locally at <http://127.0.0.1:4000/>:
1925

2026
```shell
2127
bundle exec jekyll serve

docs/_config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ plugins:
1212
# https://help.github.com/articles/redirects-on-github-pages/
1313
- jekyll-redirect-from
1414

15+
# Theme
16+
# Not currently used, but not specifying results in github-pages
17+
# defaulting to compile Primer SASS, which causes problems.
18+
# https://github.com/jekyll/jekyll/issues/7426
19+
theme: minima
20+
1521
# Conversion
1622
highlighter: rouge
1723
markdown: kramdown

0 commit comments

Comments
 (0)