Skip to content

Commit f031488

Browse files
authored
Merge pull request #50 from langdon/main
various changes for upgrade and configuration
2 parents b121330 + bb365ed commit f031488

8 files changed

+196
-194
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ _site
33
.jekyll-cache
44
.jekyll-metadata
55
vendor
6-
.vscode
6+
.vscode
7+
.config.yml

Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ source "https://rubygems.org"
77
#
88
# This will help ensure the proper Jekyll version is running.
99
# Happy Jekylling!
10-
# gem "jekyll", "~> 4.2.1"
10+
gem "jekyll", "~> 3.9.5"
1111
# This is the default theme for new Jekyll sites. You may change this to anything you like.
1212
gem "minima", "~> 2.5"
1313
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
1414
# uncomment the line below. To upgrade, run `bundle update github-pages`.
15-
gem "github-pages", "~> 219", group: :jekyll_plugins
15+
gem "github-pages", "~> 231", group: :jekyll_plugins
1616
# If you have any plugins, put them here!
1717
group :jekyll_plugins do
18-
gem "jekyll-feed", "~> 0.12"
18+
gem "jekyll-feed", "~> 0.17.0"
1919
end
2020

2121
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

+105-114
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,58 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.4.6)
4+
activesupport (7.1.3.4)
5+
base64
6+
bigdecimal
57
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)
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
8+
connection_pool (>= 2.2.5)
9+
drb
10+
i18n (>= 1.6, < 2)
11+
minitest (>= 5.1)
12+
mutex_m
13+
tzinfo (~> 2.0)
14+
addressable (2.8.7)
15+
public_suffix (>= 2.0.2, < 7.0)
16+
base64 (0.2.0)
17+
bigdecimal (3.1.8)
1218
coffee-script (2.4.1)
1319
coffee-script-source
1420
execjs
15-
coffee-script-source (1.11.1)
21+
coffee-script-source (1.12.2)
1622
colorator (1.1.0)
17-
commonmarker (0.17.13)
18-
ruby-enum (~> 0.5)
19-
concurrent-ruby (1.1.9)
20-
dnsruby (1.61.9)
21-
simpleidn (~> 0.1)
23+
commonmarker (0.23.10)
24+
concurrent-ruby (1.3.3)
25+
connection_pool (2.4.1)
26+
dnsruby (1.72.2)
27+
simpleidn (~> 0.2.1)
28+
drb (2.2.1)
2229
em-websocket (0.5.3)
2330
eventmachine (>= 0.12.9)
2431
http_parser.rb (~> 0)
25-
ethon (0.15.0)
32+
ethon (0.16.0)
2633
ffi (>= 1.15.0)
2734
eventmachine (1.2.7)
28-
execjs (2.8.1)
29-
faraday (1.10.0)
30-
faraday-em_http (~> 1.0)
31-
faraday-em_synchrony (~> 1.0)
32-
faraday-excon (~> 1.1)
33-
faraday-httpclient (~> 1.0)
34-
faraday-multipart (~> 1.0)
35-
faraday-net_http (~> 1.0)
36-
faraday-net_http_persistent (~> 1.0)
37-
faraday-patron (~> 1.0)
38-
faraday-rack (~> 1.0)
39-
faraday-retry (~> 1.0)
40-
ruby2_keywords (>= 0.0.4)
41-
faraday-em_http (1.0.0)
42-
faraday-em_synchrony (1.0.0)
43-
faraday-excon (1.1.0)
44-
faraday-httpclient (1.0.1)
45-
faraday-multipart (1.0.3)
46-
multipart-post (>= 1.2, < 3)
47-
faraday-net_http (1.0.1)
48-
faraday-net_http_persistent (1.2.0)
49-
faraday-patron (1.0.0)
50-
faraday-rack (1.0.0)
51-
faraday-retry (1.0.3)
52-
ffi (1.15.5)
35+
execjs (2.9.1)
36+
faraday (2.10.0)
37+
faraday-net_http (>= 2.0, < 3.2)
38+
logger
39+
faraday-net_http (3.1.0)
40+
net-http
41+
ffi (1.17.0-x86_64-darwin)
42+
ffi (1.17.0-x86_64-linux-gnu)
5343
forwardable-extended (2.6.0)
54-
gemoji (3.0.1)
55-
github-pages (219)
56-
github-pages-health-check (= 1.17.7)
57-
jekyll (= 3.9.0)
58-
jekyll-avatar (= 0.7.0)
59-
jekyll-coffeescript (= 1.1.1)
60-
jekyll-commonmark-ghpages (= 0.1.6)
61-
jekyll-default-layout (= 0.1.4)
62-
jekyll-feed (= 0.15.1)
44+
gemoji (4.1.0)
45+
github-pages (231)
46+
github-pages-health-check (= 1.18.2)
47+
jekyll (= 3.9.5)
48+
jekyll-avatar (= 0.8.0)
49+
jekyll-coffeescript (= 1.2.2)
50+
jekyll-commonmark-ghpages (= 0.4.0)
51+
jekyll-default-layout (= 0.1.5)
52+
jekyll-feed (= 0.17.0)
6353
jekyll-gist (= 1.5.0)
64-
jekyll-github-metadata (= 2.13.0)
54+
jekyll-github-metadata (= 2.16.1)
55+
jekyll-include-cache (= 0.2.1)
6556
jekyll-mentions (= 1.6.0)
6657
jekyll-optional-front-matter (= 0.3.2)
6758
jekyll-paginate (= 1.1.0)
@@ -70,7 +61,7 @@ GEM
7061
jekyll-relative-links (= 0.6.1)
7162
jekyll-remote-theme (= 0.4.3)
7263
jekyll-sass-converter (= 1.5.2)
73-
jekyll-seo-tag (= 2.7.1)
64+
jekyll-seo-tag (= 2.8.0)
7465
jekyll-sitemap (= 1.4.0)
7566
jekyll-swiss (= 1.0.0)
7667
jekyll-theme-architect (= 0.2.0)
@@ -87,32 +78,32 @@ GEM
8778
jekyll-theme-tactile (= 0.2.0)
8879
jekyll-theme-time-machine (= 0.2.0)
8980
jekyll-titles-from-headings (= 0.5.3)
90-
jemoji (= 0.12.0)
91-
kramdown (= 2.3.1)
81+
jemoji (= 0.13.0)
82+
kramdown (= 2.4.0)
9283
kramdown-parser-gfm (= 1.1.0)
93-
liquid (= 4.0.3)
84+
liquid (= 4.0.4)
9485
mercenary (~> 0.3)
9586
minima (= 2.5.1)
96-
nokogiri (>= 1.10.4, < 2.0)
97-
rouge (= 3.26.0)
87+
nokogiri (>= 1.13.6, < 2.0)
88+
rouge (= 3.30.0)
9889
terminal-table (~> 1.4)
99-
github-pages-health-check (1.17.7)
90+
github-pages-health-check (1.18.2)
10091
addressable (~> 2.3)
10192
dnsruby (~> 1.60)
102-
octokit (~> 4.0)
103-
public_suffix (>= 3.0, < 5.0)
93+
octokit (>= 4, < 8)
94+
public_suffix (>= 3.0, < 6.0)
10495
typhoeus (~> 1.3)
105-
html-pipeline (2.14.0)
96+
html-pipeline (2.14.3)
10697
activesupport (>= 2)
10798
nokogiri (>= 1.4)
10899
http_parser.rb (0.8.0)
109-
i18n (0.9.5)
100+
i18n (1.14.5)
110101
concurrent-ruby (~> 1.0)
111-
jekyll (3.9.0)
102+
jekyll (3.9.5)
112103
addressable (~> 2.4)
113104
colorator (~> 1.0)
114105
em-websocket (~> 0.5)
115-
i18n (~> 0.7)
106+
i18n (>= 0.7, < 2)
116107
jekyll-sass-converter (~> 1.0)
117108
jekyll-watch (~> 2.0)
118109
kramdown (>= 1.17, < 3)
@@ -121,27 +112,29 @@ GEM
121112
pathutil (~> 0.9)
122113
rouge (>= 1.7, < 4)
123114
safe_yaml (~> 1.0)
124-
jekyll-avatar (0.7.0)
115+
jekyll-avatar (0.8.0)
125116
jekyll (>= 3.0, < 5.0)
126-
jekyll-coffeescript (1.1.1)
117+
jekyll-coffeescript (1.2.2)
127118
coffee-script (~> 2.2)
128-
coffee-script-source (~> 1.11.1)
129-
jekyll-commonmark (1.3.1)
130-
commonmarker (~> 0.14)
131-
jekyll (>= 3.7, < 5.0)
132-
jekyll-commonmark-ghpages (0.1.6)
133-
commonmarker (~> 0.17.6)
134-
jekyll-commonmark (~> 1.2)
135-
rouge (>= 2.0, < 4.0)
136-
jekyll-default-layout (0.1.4)
137-
jekyll (~> 3.0)
138-
jekyll-feed (0.15.1)
119+
coffee-script-source (~> 1.12)
120+
jekyll-commonmark (1.4.0)
121+
commonmarker (~> 0.22)
122+
jekyll-commonmark-ghpages (0.4.0)
123+
commonmarker (~> 0.23.7)
124+
jekyll (~> 3.9.0)
125+
jekyll-commonmark (~> 1.4.0)
126+
rouge (>= 2.0, < 5.0)
127+
jekyll-default-layout (0.1.5)
128+
jekyll (>= 3.0, < 5.0)
129+
jekyll-feed (0.17.0)
139130
jekyll (>= 3.7, < 5.0)
140131
jekyll-gist (1.5.0)
141132
octokit (~> 4.2)
142-
jekyll-github-metadata (2.13.0)
133+
jekyll-github-metadata (2.16.1)
143134
jekyll (>= 3.4, < 5.0)
144-
octokit (~> 4.0, != 4.4.0)
135+
octokit (>= 4, < 7, != 4.4.0)
136+
jekyll-include-cache (0.2.1)
137+
jekyll (>= 3.7, < 5.0)
145138
jekyll-mentions (1.6.0)
146139
html-pipeline (~> 2.3)
147140
jekyll (>= 3.7, < 5.0)
@@ -161,7 +154,7 @@ GEM
161154
rubyzip (>= 1.3.0, < 3.0)
162155
jekyll-sass-converter (1.5.2)
163156
sass (~> 3.4)
164-
jekyll-seo-tag (2.7.1)
157+
jekyll-seo-tag (2.8.0)
165158
jekyll (>= 3.8, < 5.0)
166159
jekyll-sitemap (1.4.0)
167160
jekyll (>= 3.7, < 5.0)
@@ -210,82 +203,80 @@ GEM
210203
jekyll (>= 3.3, < 5.0)
211204
jekyll-watch (2.2.1)
212205
listen (~> 3.0)
213-
jemoji (0.12.0)
214-
gemoji (~> 3.0)
206+
jemoji (0.13.0)
207+
gemoji (>= 3, < 5)
215208
html-pipeline (~> 2.2)
216209
jekyll (>= 3.0, < 5.0)
217210
just-the-docs (0.3.3)
218211
jekyll (>= 3.8.5)
219212
jekyll-seo-tag (~> 2.0)
220213
rake (>= 12.3.1, < 13.1.0)
221-
kramdown (2.3.1)
214+
kramdown (2.4.0)
222215
rexml
223216
kramdown-parser-gfm (1.1.0)
224217
kramdown (~> 2.0)
225-
liquid (4.0.3)
226-
listen (3.7.1)
218+
liquid (4.0.4)
219+
listen (3.9.0)
227220
rb-fsevent (~> 0.10, >= 0.10.3)
228221
rb-inotify (~> 0.9, >= 0.9.10)
222+
logger (1.6.0)
229223
mercenary (0.3.6)
230224
minima (2.5.1)
231225
jekyll (>= 3.5, < 5.0)
232226
jekyll-feed (~> 0.9)
233227
jekyll-seo-tag (~> 2.1)
234-
minitest (5.15.0)
235-
multipart-post (2.1.1)
236-
nokogiri (1.13.3-x86_64-darwin)
228+
minitest (5.24.1)
229+
mutex_m (0.2.0)
230+
net-http (0.4.1)
231+
uri
232+
nokogiri (1.16.6-x86_64-darwin)
237233
racc (~> 1.4)
238-
nokogiri (1.13.3-x86_64-linux)
234+
nokogiri (1.16.6-x86_64-linux)
239235
racc (~> 1.4)
240-
octokit (4.22.0)
241-
faraday (>= 0.9)
242-
sawyer (~> 0.8.0, >= 0.5.3)
236+
octokit (4.25.1)
237+
faraday (>= 1, < 3)
238+
sawyer (~> 0.9)
243239
pathutil (0.16.2)
244240
forwardable-extended (~> 2.6)
245-
public_suffix (4.0.6)
246-
racc (1.6.0)
241+
public_suffix (5.1.1)
242+
racc (1.8.0)
247243
rake (13.0.6)
248-
rb-fsevent (0.11.1)
249-
rb-inotify (0.10.1)
244+
rb-fsevent (0.11.2)
245+
rb-inotify (0.11.1)
250246
ffi (~> 1.0)
251-
rexml (3.2.5)
252-
rouge (3.26.0)
253-
ruby-enum (0.9.0)
254-
i18n
255-
ruby2_keywords (0.0.5)
247+
rexml (3.3.1)
248+
strscan
249+
rouge (3.30.0)
256250
rubyzip (2.3.2)
257251
safe_yaml (1.0.5)
258252
sass (3.7.4)
259253
sass-listen (~> 4.0.0)
260254
sass-listen (4.0.0)
261255
rb-fsevent (~> 0.9, >= 0.9.4)
262256
rb-inotify (~> 0.9, >= 0.9.7)
263-
sawyer (0.8.2)
257+
sawyer (0.9.2)
264258
addressable (>= 2.3.5)
265-
faraday (> 0.8, < 2.0)
266-
simpleidn (0.2.1)
267-
unf (~> 0.1.4)
259+
faraday (>= 0.17.3, < 3)
260+
simpleidn (0.2.3)
261+
strscan (3.1.0)
268262
terminal-table (1.8.0)
269263
unicode-display_width (~> 1.1, >= 1.1.1)
270-
thread_safe (0.3.6)
271-
typhoeus (1.4.0)
264+
typhoeus (1.4.1)
272265
ethon (>= 0.9.0)
273-
tzinfo (1.2.9)
274-
thread_safe (~> 0.1)
275-
unf (0.1.4)
276-
unf_ext
277-
unf_ext (0.0.8)
266+
tzinfo (2.0.6)
267+
concurrent-ruby (~> 1.0)
278268
unicode-display_width (1.8.0)
279-
webrick (1.7.0)
280-
zeitwerk (2.5.4)
269+
uri (0.13.0)
270+
webrick (1.8.1)
281271

282272
PLATFORMS
283273
x86_64-darwin-19
284274
x86_64-linux
285275

286276
DEPENDENCIES
287-
github-pages (~> 219)
288-
jekyll-feed (~> 0.12)
277+
github-pages (~> 231)
278+
jekyll (~> 3.9.5)
279+
jekyll-feed (~> 0.17.0)
289280
just-the-docs (~> 0.3.3)
290281
minima (~> 2.5)
291282
tzinfo (~> 1.2)

_configcl.yml _config.cl.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ description: >- # this means to ignore newlines until "baseurl:"
2525
line in _config.yml. It will appear in your document head meta (for
2626
Google search results) and in your feed.xml site description.
2727
baseurl: "." # the subpath of your site, e.g. /blog
28+
#url: "https://<!CODESPACE_NAME>-4000.app.github.dev" # the subpath of your site, e.g. /blog
29+
url: "https://cautious-space-happiness-96vp5pwxw39pgp-4000.app.github.dev" # the subpath of your site, e.g. /blog
2830

2931
### the url field should not be active for preview deployments.
3032
### otherwise, only the initial homepage will be using the link generated for preview hosting
3133
### and any other subsequent redirects will lead to the actual website.
3234

33-
${{ if eq(env.CF_PAGES_BRANCH), 'main' }}:
34-
url: "https://bu-spark.github.io" # the base hostname & protocol for your site, e.g. http://example.com
35+
#${{ if eq(env.CF_PAGES_BRANCH), 'main' }}:
36+
# url: "https://bu-spark.github.io" # the base hostname & protocol for your site, e.g. http://example.com
3537
###
3638

3739
github_username: bu-spark

_configpr.yml _config.pr.yml

File renamed without changes.

0 commit comments

Comments
 (0)