Skip to content

Commit 811b5f7

Browse files
authored
Merge branch 'main' into main
2 parents ae6fb89 + b13fad4 commit 811b5f7

28 files changed

+1305
-371
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
- name: Get Ruby version
1818
id: rubyversion
19-
run: echo "::set-output name=version::$(curl https://raw.githubusercontent.com/github/pages-gem/master/.ruby-version)"
19+
run: echo "::set-output name=version::3.2"
2020

2121
- name: Set up Ruby
2222
uses: ruby/setup-ruby@v1

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
source 'https://rubygems.org'
33

44
group :jekyll_plugins do
5-
gem "github-pages", "228"
5+
gem "github-pages", "231"
66
end
77

88
gem 'wdm', '>= 0.1.1' if Gem.win_platform?
99

1010
gem "webrick", "~> 1.8"
1111

1212
gem 'html-proofer', "~> 3.19.4"
13+
14+
gem 'json'

Gemfile.lock

Lines changed: 53 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.1.2)
4+
activesupport (7.1.3.2)
55
base64
66
bigdecimal
77
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -14,45 +14,42 @@ GEM
1414
addressable (2.8.6)
1515
public_suffix (>= 2.0.2, < 6.0)
1616
base64 (0.2.0)
17-
bigdecimal (3.1.4)
17+
bigdecimal (3.1.7)
1818
coffee-script (2.4.1)
1919
coffee-script-source
2020
execjs
21-
coffee-script-source (1.11.1)
21+
coffee-script-source (1.12.2)
2222
colorator (1.1.0)
2323
commonmarker (0.23.10)
24-
concurrent-ruby (1.2.2)
24+
concurrent-ruby (1.2.3)
2525
connection_pool (2.4.1)
26-
dnsruby (1.70.0)
26+
dnsruby (1.71.0)
2727
simpleidn (~> 0.2.1)
28-
drb (2.2.0)
29-
ruby2_keywords
28+
drb (2.2.1)
3029
em-websocket (0.5.3)
3130
eventmachine (>= 0.12.9)
3231
http_parser.rb (~> 0)
3332
ethon (0.16.0)
3433
ffi (>= 1.15.0)
3534
eventmachine (1.2.7)
3635
execjs (2.9.1)
37-
faraday (2.7.12)
38-
base64
39-
faraday-net_http (>= 2.0, < 3.1)
40-
ruby2_keywords (>= 0.0.4)
41-
faraday-net_http (3.0.2)
36+
faraday (2.9.0)
37+
faraday-net_http (>= 2.0, < 3.2)
38+
faraday-net_http (3.1.0)
39+
net-http
4240
ffi (1.16.3)
43-
ffi (1.16.3-x64-mingw-ucrt)
4441
forwardable-extended (2.6.0)
45-
gemoji (3.0.1)
46-
github-pages (228)
47-
github-pages-health-check (= 1.17.9)
48-
jekyll (= 3.9.3)
49-
jekyll-avatar (= 0.7.0)
50-
jekyll-coffeescript (= 1.1.1)
42+
gemoji (4.1.0)
43+
github-pages (231)
44+
github-pages-health-check (= 1.18.2)
45+
jekyll (= 3.9.5)
46+
jekyll-avatar (= 0.8.0)
47+
jekyll-coffeescript (= 1.2.2)
5148
jekyll-commonmark-ghpages (= 0.4.0)
52-
jekyll-default-layout (= 0.1.4)
53-
jekyll-feed (= 0.15.1)
49+
jekyll-default-layout (= 0.1.5)
50+
jekyll-feed (= 0.17.0)
5451
jekyll-gist (= 1.5.0)
55-
jekyll-github-metadata (= 2.13.0)
52+
jekyll-github-metadata (= 2.16.1)
5653
jekyll-include-cache (= 0.2.1)
5754
jekyll-mentions (= 1.6.0)
5855
jekyll-optional-front-matter (= 0.3.2)
@@ -79,20 +76,20 @@ GEM
7976
jekyll-theme-tactile (= 0.2.0)
8077
jekyll-theme-time-machine (= 0.2.0)
8178
jekyll-titles-from-headings (= 0.5.3)
82-
jemoji (= 0.12.0)
83-
kramdown (= 2.3.2)
79+
jemoji (= 0.13.0)
80+
kramdown (= 2.4.0)
8481
kramdown-parser-gfm (= 1.1.0)
8582
liquid (= 4.0.4)
8683
mercenary (~> 0.3)
8784
minima (= 2.5.1)
8885
nokogiri (>= 1.13.6, < 2.0)
89-
rouge (= 3.26.0)
86+
rouge (= 3.30.0)
9087
terminal-table (~> 1.4)
91-
github-pages-health-check (1.17.9)
88+
github-pages-health-check (1.18.2)
9289
addressable (~> 2.3)
9390
dnsruby (~> 1.60)
94-
octokit (~> 4.0)
95-
public_suffix (>= 3.0, < 5.0)
91+
octokit (>= 4, < 8)
92+
public_suffix (>= 3.0, < 6.0)
9693
typhoeus (~> 1.3)
9794
html-pipeline (2.14.3)
9895
activesupport (>= 2)
@@ -106,9 +103,9 @@ GEM
106103
typhoeus (~> 1.3)
107104
yell (~> 2.0)
108105
http_parser.rb (0.8.0)
109-
i18n (1.14.1)
106+
i18n (1.14.4)
110107
concurrent-ruby (~> 1.0)
111-
jekyll (3.9.3)
108+
jekyll (3.9.5)
112109
addressable (~> 2.4)
113110
colorator (~> 1.0)
114111
em-websocket (~> 0.5)
@@ -121,27 +118,27 @@ GEM
121118
pathutil (~> 0.9)
122119
rouge (>= 1.7, < 4)
123120
safe_yaml (~> 1.0)
124-
jekyll-avatar (0.7.0)
121+
jekyll-avatar (0.8.0)
125122
jekyll (>= 3.0, < 5.0)
126-
jekyll-coffeescript (1.1.1)
123+
jekyll-coffeescript (1.2.2)
127124
coffee-script (~> 2.2)
128-
coffee-script-source (~> 1.11.1)
125+
coffee-script-source (~> 1.12)
129126
jekyll-commonmark (1.4.0)
130127
commonmarker (~> 0.22)
131128
jekyll-commonmark-ghpages (0.4.0)
132129
commonmarker (~> 0.23.7)
133130
jekyll (~> 3.9.0)
134131
jekyll-commonmark (~> 1.4.0)
135132
rouge (>= 2.0, < 5.0)
136-
jekyll-default-layout (0.1.4)
137-
jekyll (~> 3.0)
138-
jekyll-feed (0.15.1)
133+
jekyll-default-layout (0.1.5)
134+
jekyll (>= 3.0, < 5.0)
135+
jekyll-feed (0.17.0)
139136
jekyll (>= 3.7, < 5.0)
140137
jekyll-gist (1.5.0)
141138
octokit (~> 4.2)
142-
jekyll-github-metadata (2.13.0)
139+
jekyll-github-metadata (2.16.1)
143140
jekyll (>= 3.4, < 5.0)
144-
octokit (~> 4.0, != 4.4.0)
141+
octokit (>= 4, < 7, != 4.4.0)
145142
jekyll-include-cache (0.2.1)
146143
jekyll (>= 3.7, < 5.0)
147144
jekyll-mentions (1.6.0)
@@ -212,46 +209,46 @@ GEM
212209
jekyll (>= 3.3, < 5.0)
213210
jekyll-watch (2.2.1)
214211
listen (~> 3.0)
215-
jemoji (0.12.0)
216-
gemoji (~> 3.0)
212+
jemoji (0.13.0)
213+
gemoji (>= 3, < 5)
217214
html-pipeline (~> 2.2)
218215
jekyll (>= 3.0, < 5.0)
219-
kramdown (2.3.2)
216+
json (2.7.2)
217+
kramdown (2.4.0)
220218
rexml
221219
kramdown-parser-gfm (1.1.0)
222220
kramdown (~> 2.0)
223221
liquid (4.0.4)
224-
listen (3.8.0)
222+
listen (3.9.0)
225223
rb-fsevent (~> 0.10, >= 0.10.3)
226224
rb-inotify (~> 0.9, >= 0.9.10)
227225
mercenary (0.3.6)
228226
minima (2.5.1)
229227
jekyll (>= 3.5, < 5.0)
230228
jekyll-feed (~> 0.9)
231229
jekyll-seo-tag (~> 2.1)
232-
minitest (5.20.0)
230+
minitest (5.22.3)
233231
mutex_m (0.2.0)
234-
nokogiri (1.15.5-arm64-darwin)
235-
racc (~> 1.4)
236-
nokogiri (1.15.5-x64-mingw-ucrt)
232+
net-http (0.4.1)
233+
uri
234+
nokogiri (1.16.3-arm64-darwin)
237235
racc (~> 1.4)
238-
nokogiri (1.15.5-x86_64-linux)
236+
nokogiri (1.16.3-x86_64-linux)
239237
racc (~> 1.4)
240238
octokit (4.25.1)
241239
faraday (>= 1, < 3)
242240
sawyer (~> 0.9)
243-
parallel (1.23.0)
241+
parallel (1.24.0)
244242
pathutil (0.16.2)
245243
forwardable-extended (~> 2.6)
246-
public_suffix (4.0.7)
244+
public_suffix (5.0.4)
247245
racc (1.7.3)
248246
rainbow (3.1.1)
249247
rb-fsevent (0.11.2)
250248
rb-inotify (0.10.1)
251249
ffi (~> 1.0)
252250
rexml (3.2.6)
253-
rouge (3.26.0)
254-
ruby2_keywords (0.0.5)
251+
rouge (3.30.0)
255252
rubyzip (2.3.2)
256253
safe_yaml (1.0.5)
257254
sass (3.7.4)
@@ -273,20 +270,20 @@ GEM
273270
unf (0.1.4)
274271
unf_ext
275272
unf_ext (0.0.9.1)
276-
unf_ext (0.0.9.1-x64-mingw-ucrt)
277273
unicode-display_width (1.8.0)
274+
uri (0.13.0)
278275
webrick (1.8.1)
279276
yell (2.2.2)
280277

281278
PLATFORMS
282-
arm64-darwin-20
283-
x64-mingw-ucrt
279+
arm64-darwin-22
284280
x86_64-linux
285281

286282
DEPENDENCIES
287-
github-pages (= 228)
283+
github-pages (= 231)
288284
html-proofer (~> 3.19.4)
285+
json
289286
webrick (~> 1.8)
290287

291288
BUNDLED WITH
292-
2.4.21
289+
2.5.6

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,10 @@ above structure. Currently, the site only supports three levels of nesting (sub-
130130

131131
This repository was created via a fork of Edition, which is a product documentation theme for Jekyll created
132132
by by [CloudCannon](http://cloudcannon.com/), the Cloud CMS for Jekyll.
133+
134+
135+
136+
### Ruby Version Troubleshooting
137+
138+
In February 2024:
139+
* https://ritviknag.com/tech-tips/ruby-versioning-hell-with-jekyll-&-github-pages/

_docs/developer/development_instructions/automated_grading.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ number:
7777
"capabilities": [
7878
"extra_ram"
7979
],
80+
"enabled": true,
8081
"num_autograding_workers": 2
8182
}
8283
```

0 commit comments

Comments
 (0)