Skip to content

Commit dee2105

Browse files
committed
Merge #963: Minimize dependencies and add CI that matches the build server
5948514 ci: Add task for building on debian bullseye only (Andrew Chow) 41749ba deps: Minimize dependencies to just jekyll and necessary plugins (Andrew Chow) Pull request description: We don't need all of the github pages dependencies, just jekyll and a few others. Also add a CI task that behaves similarly to the site's build server so we can catch issues earlier. ACKs for top commit: glozow: ACK 5948514 Tree-SHA512: 307040a8842ca870deb6f7e0fe4878eb5b6144ba2b9e372ba89c63eb2ef7d0a82f82839aa08bee74b9e2bf71737a88878f1258eb31de4399d7a9e231a55057f4
2 parents 92ced88 + 5948514 commit dee2105

File tree

3 files changed

+30
-209
lines changed

3 files changed

+30
-209
lines changed

.cirrus.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
container:
22
image: ruby:2.7.4
33

4-
task:
5-
name: website
6-
env:
4+
env:
75
JEKYLL_ENV: production
86
NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
97
RUBYOPT: "-KU -E utf-8:utf-8"
108

9+
task:
10+
name: Bundler build
11+
1112
bootstrap_script: gem install bundler
1213
bundler_cache:
1314
folder: /usr/local/bundle
@@ -17,3 +18,22 @@ task:
1718
populate_script: bundle install
1819

1920
build_and_test_script: make all
21+
22+
task:
23+
name: debian only
24+
container:
25+
image: debian:bullseye
26+
install_script:
27+
- apt update
28+
- >
29+
apt install -y
30+
curl
31+
jekyll
32+
make
33+
ruby
34+
ruby-jekyll-redirect-from
35+
ruby-kramdown-parser-gfm
36+
ruby-html-proofer
37+
build_and_test_script:
38+
- rm Gemfile.lock
39+
- make all

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ ruby '2.7.4'
88

99
## If you add a new Gem below, run `bundle install` to install it.
1010
group :development do
11-
gem 'github-pages'
11+
gem 'jekyll'
12+
gem 'jekyll-redirect-from'
13+
gem 'kramdown-parser-gfm'
1214
end
1315

1416
group :testing do

Gemfile.lock

Lines changed: 4 additions & 205 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,18 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.4.4)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
zeitwerk (~> 2.2, >= 2.2.2)
104
addressable (2.8.0)
115
public_suffix (>= 2.0.2, < 5.0)
12-
coffee-script (2.4.1)
13-
coffee-script-source
14-
execjs
15-
coffee-script-source (1.11.1)
166
colorator (1.1.0)
17-
commonmarker (0.17.13)
18-
ruby-enum (~> 0.5)
197
concurrent-ruby (1.1.9)
20-
dnsruby (1.61.7)
21-
simpleidn (~> 0.1)
228
em-websocket (0.5.3)
239
eventmachine (>= 0.12.9)
2410
http_parser.rb (~> 0)
2511
ethon (0.15.0)
2612
ffi (>= 1.15.0)
2713
eventmachine (1.2.7)
28-
execjs (2.8.1)
29-
faraday (1.8.0)
30-
faraday-em_http (~> 1.0)
31-
faraday-em_synchrony (~> 1.0)
32-
faraday-excon (~> 1.1)
33-
faraday-httpclient (~> 1.0.1)
34-
faraday-net_http (~> 1.0)
35-
faraday-net_http_persistent (~> 1.1)
36-
faraday-patron (~> 1.0)
37-
faraday-rack (~> 1.0)
38-
multipart-post (>= 1.2, < 3)
39-
ruby2_keywords (>= 0.0.4)
40-
faraday-em_http (1.0.0)
41-
faraday-em_synchrony (1.0.0)
42-
faraday-excon (1.1.0)
43-
faraday-httpclient (1.0.1)
44-
faraday-net_http (1.0.1)
45-
faraday-net_http_persistent (1.2.0)
46-
faraday-patron (1.0.0)
47-
faraday-rack (1.0.0)
4814
ffi (1.15.4)
4915
forwardable-extended (2.6.0)
50-
gemoji (3.0.1)
51-
github-pages (222)
52-
github-pages-health-check (= 1.17.9)
53-
jekyll (= 3.9.0)
54-
jekyll-avatar (= 0.7.0)
55-
jekyll-coffeescript (= 1.1.1)
56-
jekyll-commonmark-ghpages (= 0.1.6)
57-
jekyll-default-layout (= 0.1.4)
58-
jekyll-feed (= 0.15.1)
59-
jekyll-gist (= 1.5.0)
60-
jekyll-github-metadata (= 2.13.0)
61-
jekyll-mentions (= 1.6.0)
62-
jekyll-optional-front-matter (= 0.3.2)
63-
jekyll-paginate (= 1.1.0)
64-
jekyll-readme-index (= 0.3.0)
65-
jekyll-redirect-from (= 0.16.0)
66-
jekyll-relative-links (= 0.6.1)
67-
jekyll-remote-theme (= 0.4.3)
68-
jekyll-sass-converter (= 1.5.2)
69-
jekyll-seo-tag (= 2.7.1)
70-
jekyll-sitemap (= 1.4.0)
71-
jekyll-swiss (= 1.0.0)
72-
jekyll-theme-architect (= 0.2.0)
73-
jekyll-theme-cayman (= 0.2.0)
74-
jekyll-theme-dinky (= 0.2.0)
75-
jekyll-theme-hacker (= 0.2.0)
76-
jekyll-theme-leap-day (= 0.2.0)
77-
jekyll-theme-merlot (= 0.2.0)
78-
jekyll-theme-midnight (= 0.2.0)
79-
jekyll-theme-minimal (= 0.2.0)
80-
jekyll-theme-modernist (= 0.2.0)
81-
jekyll-theme-primer (= 0.6.0)
82-
jekyll-theme-slate (= 0.2.0)
83-
jekyll-theme-tactile (= 0.2.0)
84-
jekyll-theme-time-machine (= 0.2.0)
85-
jekyll-titles-from-headings (= 0.5.3)
86-
jemoji (= 0.12.0)
87-
kramdown (= 2.3.1)
88-
kramdown-parser-gfm (= 1.1.0)
89-
liquid (= 4.0.3)
90-
mercenary (~> 0.3)
91-
minima (= 2.5.1)
92-
nokogiri (>= 1.12.5, < 2.0)
93-
rouge (= 3.26.0)
94-
terminal-table (~> 1.4)
95-
github-pages-health-check (1.17.9)
96-
addressable (~> 2.3)
97-
dnsruby (~> 1.60)
98-
octokit (~> 4.0)
99-
public_suffix (>= 3.0, < 5.0)
100-
typhoeus (~> 1.3)
101-
html-pipeline (2.14.0)
102-
activesupport (>= 2)
103-
nokogiri (>= 1.4)
10416
html-proofer (3.19.2)
10517
addressable (~> 2.3)
10618
mercenary (~> 0.3)
@@ -125,99 +37,12 @@ GEM
12537
pathutil (~> 0.9)
12638
rouge (>= 1.7, < 4)
12739
safe_yaml (~> 1.0)
128-
jekyll-avatar (0.7.0)
129-
jekyll (>= 3.0, < 5.0)
130-
jekyll-coffeescript (1.1.1)
131-
coffee-script (~> 2.2)
132-
coffee-script-source (~> 1.11.1)
133-
jekyll-commonmark (1.3.1)
134-
commonmarker (~> 0.14)
135-
jekyll (>= 3.7, < 5.0)
136-
jekyll-commonmark-ghpages (0.1.6)
137-
commonmarker (~> 0.17.6)
138-
jekyll-commonmark (~> 1.2)
139-
rouge (>= 2.0, < 4.0)
140-
jekyll-default-layout (0.1.4)
141-
jekyll (~> 3.0)
142-
jekyll-feed (0.15.1)
143-
jekyll (>= 3.7, < 5.0)
144-
jekyll-gist (1.5.0)
145-
octokit (~> 4.2)
146-
jekyll-github-metadata (2.13.0)
147-
jekyll (>= 3.4, < 5.0)
148-
octokit (~> 4.0, != 4.4.0)
149-
jekyll-mentions (1.6.0)
150-
html-pipeline (~> 2.3)
151-
jekyll (>= 3.7, < 5.0)
152-
jekyll-optional-front-matter (0.3.2)
153-
jekyll (>= 3.0, < 5.0)
154-
jekyll-paginate (1.1.0)
155-
jekyll-readme-index (0.3.0)
156-
jekyll (>= 3.0, < 5.0)
15740
jekyll-redirect-from (0.16.0)
15841
jekyll (>= 3.3, < 5.0)
159-
jekyll-relative-links (0.6.1)
160-
jekyll (>= 3.3, < 5.0)
161-
jekyll-remote-theme (0.4.3)
162-
addressable (~> 2.0)
163-
jekyll (>= 3.5, < 5.0)
164-
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
165-
rubyzip (>= 1.3.0, < 3.0)
16642
jekyll-sass-converter (1.5.2)
16743
sass (~> 3.4)
168-
jekyll-seo-tag (2.7.1)
169-
jekyll (>= 3.8, < 5.0)
170-
jekyll-sitemap (1.4.0)
171-
jekyll (>= 3.7, < 5.0)
172-
jekyll-swiss (1.0.0)
173-
jekyll-theme-architect (0.2.0)
174-
jekyll (> 3.5, < 5.0)
175-
jekyll-seo-tag (~> 2.0)
176-
jekyll-theme-cayman (0.2.0)
177-
jekyll (> 3.5, < 5.0)
178-
jekyll-seo-tag (~> 2.0)
179-
jekyll-theme-dinky (0.2.0)
180-
jekyll (> 3.5, < 5.0)
181-
jekyll-seo-tag (~> 2.0)
182-
jekyll-theme-hacker (0.2.0)
183-
jekyll (> 3.5, < 5.0)
184-
jekyll-seo-tag (~> 2.0)
185-
jekyll-theme-leap-day (0.2.0)
186-
jekyll (> 3.5, < 5.0)
187-
jekyll-seo-tag (~> 2.0)
188-
jekyll-theme-merlot (0.2.0)
189-
jekyll (> 3.5, < 5.0)
190-
jekyll-seo-tag (~> 2.0)
191-
jekyll-theme-midnight (0.2.0)
192-
jekyll (> 3.5, < 5.0)
193-
jekyll-seo-tag (~> 2.0)
194-
jekyll-theme-minimal (0.2.0)
195-
jekyll (> 3.5, < 5.0)
196-
jekyll-seo-tag (~> 2.0)
197-
jekyll-theme-modernist (0.2.0)
198-
jekyll (> 3.5, < 5.0)
199-
jekyll-seo-tag (~> 2.0)
200-
jekyll-theme-primer (0.6.0)
201-
jekyll (> 3.5, < 5.0)
202-
jekyll-github-metadata (~> 2.9)
203-
jekyll-seo-tag (~> 2.0)
204-
jekyll-theme-slate (0.2.0)
205-
jekyll (> 3.5, < 5.0)
206-
jekyll-seo-tag (~> 2.0)
207-
jekyll-theme-tactile (0.2.0)
208-
jekyll (> 3.5, < 5.0)
209-
jekyll-seo-tag (~> 2.0)
210-
jekyll-theme-time-machine (0.2.0)
211-
jekyll (> 3.5, < 5.0)
212-
jekyll-seo-tag (~> 2.0)
213-
jekyll-titles-from-headings (0.5.3)
214-
jekyll (>= 3.3, < 5.0)
21544
jekyll-watch (2.2.1)
21645
listen (~> 3.0)
217-
jemoji (0.12.0)
218-
gemoji (~> 3.0)
219-
html-pipeline (~> 2.2)
220-
jekyll (>= 3.0, < 5.0)
22146
kramdown (2.3.1)
22247
rexml
22348
kramdown-parser-gfm (1.1.0)
@@ -228,20 +53,11 @@ GEM
22853
rb-inotify (~> 0.9, >= 0.9.10)
22954
mercenary (0.3.6)
23055
mini_portile2 (2.6.1)
231-
minima (2.5.1)
232-
jekyll (>= 3.5, < 5.0)
233-
jekyll-feed (~> 0.9)
234-
jekyll-seo-tag (~> 2.1)
235-
minitest (5.15.0)
236-
multipart-post (2.1.1)
23756
nokogiri (1.12.5)
23857
mini_portile2 (~> 2.6.1)
23958
racc (~> 1.4)
24059
nokogumbo (2.0.5)
24160
nokogiri (~> 1.8, >= 1.8.4)
242-
octokit (4.21.0)
243-
faraday (>= 0.9)
244-
sawyer (~> 0.8.0, >= 0.5.3)
24561
parallel (1.21.0)
24662
pathutil (0.16.2)
24763
forwardable-extended (~> 2.6)
@@ -253,44 +69,27 @@ GEM
25369
ffi (~> 1.0)
25470
rexml (3.2.5)
25571
rouge (3.26.0)
256-
ruby-enum (0.9.0)
257-
i18n
258-
ruby2_keywords (0.0.5)
259-
rubyzip (2.3.2)
26072
safe_yaml (1.0.5)
26173
sass (3.7.4)
26274
sass-listen (~> 4.0.0)
26375
sass-listen (4.0.0)
26476
rb-fsevent (~> 0.9, >= 0.9.4)
26577
rb-inotify (~> 0.9, >= 0.9.7)
266-
sawyer (0.8.2)
267-
addressable (>= 2.3.5)
268-
faraday (> 0.8, < 2.0)
269-
simpleidn (0.2.1)
270-
unf (~> 0.1.4)
271-
terminal-table (1.8.0)
272-
unicode-display_width (~> 1.1, >= 1.1.1)
273-
thread_safe (0.3.6)
27478
typhoeus (1.4.0)
27579
ethon (>= 0.9.0)
276-
tzinfo (1.2.9)
277-
thread_safe (~> 0.1)
278-
unf (0.1.4)
279-
unf_ext
280-
unf_ext (0.0.8)
281-
unicode-display_width (1.8.0)
28280
yell (2.2.2)
283-
zeitwerk (2.5.1)
28481

28582
PLATFORMS
28683
ruby
28784

28885
DEPENDENCIES
289-
github-pages
29086
html-proofer
87+
jekyll
88+
jekyll-redirect-from
89+
kramdown-parser-gfm
29190

29291
RUBY VERSION
29392
ruby 2.7.4p191
29493

29594
BUNDLED WITH
296-
2.2.33
95+
2.4.12

0 commit comments

Comments
 (0)