Skip to content

Commit d836c6e

Browse files
authored
ci: bump ruby to 3.1, fix scss building (#29)
1 parent e6fd2a6 commit d836c6e

File tree

7 files changed

+46
-40
lines changed

7 files changed

+46
-40
lines changed

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
ruby_version: ['2.7']
18+
ruby_version: ['3.1']
1919
python_version: ['3.10']
2020
steps:
2121
- name: Checkout 🛎️

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
_site
22
.*cache
33
.jekyll-metadata
4+
.ruby-version
45
.bundle
56
vendor
67
_build

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile.lock

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.8.5)
5+
public_suffix (>= 2.0.2, < 6.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.6)
8-
em-websocket (0.5.1)
7+
concurrent-ruby (1.2.2)
8+
em-websocket (0.5.3)
99
eventmachine (>= 0.12.9)
10-
http_parser.rb (~> 0.6.0)
10+
http_parser.rb (~> 0)
1111
eventmachine (1.2.7)
1212
execjs (2.8.1)
1313
ffi (1.15.5)
1414
forwardable-extended (2.6.0)
15-
http_parser.rb (0.6.0)
16-
i18n (1.8.5)
15+
google-protobuf (3.24.2)
16+
http_parser.rb (0.8.0)
17+
i18n (1.14.1)
1718
concurrent-ruby (~> 1.0)
18-
jekyll (4.1.1)
19+
jekyll (4.3.2)
1920
addressable (~> 2.4)
2021
colorator (~> 1.0)
2122
em-websocket (~> 0.5)
2223
i18n (~> 1.0)
23-
jekyll-sass-converter (~> 2.0)
24+
jekyll-sass-converter (>= 2.0, < 4.0)
2425
jekyll-watch (~> 2.0)
25-
kramdown (~> 2.1)
26+
kramdown (~> 2.3, >= 2.3.1)
2627
kramdown-parser-gfm (~> 1.0)
2728
liquid (~> 4.0)
28-
mercenary (~> 0.4.0)
29+
mercenary (>= 0.3.6, < 0.5)
2930
pathutil (~> 0.9)
30-
rouge (~> 3.0)
31+
rouge (>= 3.0, < 5.0)
3132
safe_yaml (~> 1.0)
32-
terminal-table (~> 1.8)
33+
terminal-table (>= 1.8, < 4.0)
34+
webrick (~> 1.7)
3335
jekyll-compose (0.12.0)
3436
jekyll (>= 3.7, < 5.0)
35-
jekyll-feed (0.16.0)
37+
jekyll-feed (0.17.0)
3638
jekyll (>= 3.7, < 5.0)
3739
jekyll-last-modified-at (1.3.0)
3840
jekyll (>= 3.7, < 5.0)
3941
posix-spawn (~> 0.3.9)
40-
jekyll-pug (1.5.6)
42+
jekyll-pug (1.6.0)
4143
jekyll (>= 3.6, < 5.0)
4244
pug-ruby (~> 2.0)
4345
jekyll-redirect-from (0.16.0)
4446
jekyll (>= 3.3, < 5.0)
45-
jekyll-sass-converter (2.1.0)
46-
sassc (> 2.0.1, < 3.0)
47+
jekyll-sass-converter (3.0.0)
48+
sass-embedded (~> 1.54)
4749
jekyll-sitemap (1.4.0)
4850
jekyll (>= 3.7, < 5.0)
4951
jekyll-watch (2.2.1)
5052
listen (~> 3.0)
51-
kramdown (2.3.1)
53+
kramdown (2.4.0)
5254
rexml
5355
kramdown-parser-gfm (1.1.0)
5456
kramdown (~> 2.0)
55-
liquid (4.0.3)
56-
listen (3.2.1)
57+
liquid (4.0.4)
58+
listen (3.8.0)
5759
rb-fsevent (~> 0.10, >= 0.10.3)
5860
rb-inotify (~> 0.9, >= 0.9.10)
5961
memoist (0.16.2)
@@ -62,24 +64,27 @@ GEM
6264
pathutil (0.16.2)
6365
forwardable-extended (~> 2.6)
6466
posix-spawn (0.3.15)
65-
public_suffix (4.0.6)
67+
public_suffix (5.0.3)
6668
pug-ruby (2.0.1)
6769
execjs (~> 2.0)
6870
memoist (~> 0.15)
6971
method-not-implemented (~> 1.0, >= 1.0.1)
7072
regexp-match-polyfill (~> 1.0, >= 1.0.2)
71-
rb-fsevent (0.10.4)
73+
rake (13.0.6)
74+
rb-fsevent (0.11.2)
7275
rb-inotify (0.10.1)
7376
ffi (~> 1.0)
7477
regexp-match-polyfill (1.0.2)
75-
rexml (3.2.5)
76-
rouge (3.21.0)
78+
rexml (3.2.6)
79+
rouge (4.1.3)
7780
safe_yaml (1.0.5)
78-
sassc (2.4.0)
79-
ffi (~> 1.9)
80-
terminal-table (1.8.0)
81-
unicode-display_width (~> 1.1, >= 1.1.1)
82-
unicode-display_width (1.7.0)
81+
sass-embedded (1.66.1)
82+
google-protobuf (~> 3.23)
83+
rake (>= 13.0.0)
84+
terminal-table (3.0.2)
85+
unicode-display_width (>= 1.1.1, < 3)
86+
unicode-display_width (2.4.2)
87+
webrick (1.8.1)
8388

8489
PLATFORMS
8590
ruby

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ clean:
3131
-rm -r _site
3232
-rm -r _build
3333
-rm -r _includes/tables
34+
-git restore _includes/tables/github-stats.html
3435
-make --directory=contributor-stats clean
3536

3637

_sass/_base.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ h1, h2, h3, h4, h5, h6,
7979
p, blockquote, pre,
8080
ul, ol, dl, figure,
8181
%vertical-rhythm {
82-
margin-bottom: $spacing-unit / 2;
82+
margin-bottom: calc($spacing-unit / 2);
8383
}
8484

8585

@@ -156,7 +156,7 @@ a {
156156
blockquote {
157157
color: $grey-color;
158158
border-left: 4px solid $grey-color-light;
159-
padding-left: $spacing-unit / 2;
159+
padding-left: calc($spacing-unit / 2);
160160
font-size: 18px;
161161
letter-spacing: -1px;
162162
font-style: italic;
@@ -211,8 +211,8 @@ pre {
211211
@include media-query($on-laptop) {
212212
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
213213
max-width: calc(#{$content-width} - (#{$spacing-unit}));
214-
padding-right: $spacing-unit / 2;
215-
padding-left: $spacing-unit / 2;
214+
padding-right: calc($spacing-unit / 2);
215+
padding-left: calc($spacing-unit / 2);
216216
}
217217
}
218218

_sass/_layout.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
.footer-heading {
3737
font-size: 18px;
38-
margin-bottom: $spacing-unit / 2;
38+
margin-bottom: calc($spacing-unit / 2);
3939
}
4040

4141
.contact-list,
@@ -47,14 +47,14 @@
4747
.footer-col-wrapper {
4848
font-size: 15px;
4949
color: $grey-color;
50-
margin-left: -$spacing-unit / 2;
50+
margin-left: calc($spacing-unit / -2);
5151
@extend %clearfix;
5252
}
5353

5454
.footer-col {
5555
float: left;
56-
margin-bottom: $spacing-unit / 2;
57-
padding-left: $spacing-unit / 2;
56+
margin-bottom: calc($spacing-unit / 2);
57+
padding-left: calc($spacing-unit / 2);
5858
}
5959

6060
.footer-col-1 {
@@ -181,7 +181,7 @@
181181
th,
182182
td {
183183
border: 1px solid $grey-color-light;
184-
padding: $spacing-unit / 4;
184+
padding: calc($spacing-unit / 4);
185185
}
186186
}
187187
}

0 commit comments

Comments
 (0)