Skip to content

Commit 4ca3d57

Browse files
csdevcsdev
committedJun 11, 2024
chore(deps): update gems and github actions
1 parent 3859504 commit 4ca3d57

File tree

5 files changed

+104
-68
lines changed

5 files changed

+104
-68
lines changed
 

Diff for: ‎.github/workflows/jekyll.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929
- name: Setup Ruby
30-
uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
30+
uses: ruby/setup-ruby@v1
3131
with:
3232
working-directory: ./site
3333
ruby-version: '2.7.4' # Not needed with a .ruby-version file
34+
rubygems: '3.4.22'
3435
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
35-
cache-version: 0 # Increment this number if you need to re-download cached gems
36+
cache-version: 1 # Increment this number if you need to re-download cached gems
3637
- name: Setup Pages
3738
id: pages
38-
uses: actions/configure-pages@v2
39+
uses: actions/configure-pages@v5
3940
- name: Build with Jekyll
4041
working-directory: ./site
4142
# Outputs to the './_site' directory by default
@@ -44,7 +45,7 @@ jobs:
4445
JEKYLL_ENV: production
4546
- name: Upload artifact
4647
# Automatically uploads an artifact from the './_site' directory by default
47-
uses: actions/upload-pages-artifact@v1
48+
uses: actions/upload-pages-artifact@v3
4849
with:
4950
path: ./site/_site/
5051

@@ -58,4 +59,4 @@ jobs:
5859
steps:
5960
- name: Deploy to GitHub Pages
6061
id: deployment
61-
uses: actions/deploy-pages@v1
62+
uses: actions/deploy-pages@v4

Diff for: ‎Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ RUN apt-get update \
77
&& apt-get install -y build-essential dumb-init gcc zlib1g-dev \
88
&& rm -rf /var/lib/apt/lists/*
99

10+
# update gem to avoid issues with older versions
11+
# this also provides bundler 2.4.22
12+
RUN gem update --system '3.4.22' \
13+
&& which gem && gem --version \
14+
&& which bundle && bundle --version
15+
1016
RUN groupadd --gid "$GID" jekyll \
1117
&& useradd --uid "$UID" --gid "$GID" -m jekyll
1218

@@ -15,9 +21,6 @@ WORKDIR /home/jekyll
1521
ENV GEM_HOME="/home/jekyll/gems" \
1622
PATH="/home/jekyll/gems/bin:$PATH"
1723

18-
RUN gem install bundler
19-
RUN gem install jekyll -v '3.9.2'
20-
2124
WORKDIR /home/jekyll/site
2225
COPY --chown=jekyll site/Gemfile site/Gemfile.lock ./
2326
RUN BUNDLE_FROZEN=true bundle install

Diff for: ‎README.md

+20-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
# csdev.github.io
1+
# csdev.github.io
2+
3+
## Commands
4+
5+
Serve docs locally:
6+
7+
```sh
8+
docker-compose run --rm --service-ports jekyll-serve
9+
```
10+
11+
Rebuild container:
12+
13+
```sh
14+
docker-compose build --progress=plain jekyll
15+
```
16+
17+
Update gems (inside dev container):
18+
```sh
19+
bundle update
20+
```

Diff for: ‎site/Gemfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ source "https://rubygems.org"
88
# This will help ensure the proper Jekyll version is running.
99
# Happy Jekylling!
1010

11+
# install older version of ffi for compatibility with ruby 2.7
12+
gem "ffi", "~> 1.16.3"
13+
1114
# https://pages.github.com/versions/
12-
gem "jekyll", "~> 3.9.3"
15+
gem "jekyll", "~> 3.9.5"
1316
gem "minima", "~> 2.5.1"
14-
gem "github-pages", "~> 228", group: :jekyll_plugins
17+
gem "github-pages", "~> 231", group: :jekyll_plugins
1518

1619
group :jekyll_plugins do
17-
gem "jekyll-feed", "~> 0.15.1"
20+
gem "jekyll-feed", "~> 0.17.0"
1821
end
1922

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

Diff for: ‎site/Gemfile.lock

+65-55
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.4.3)
4+
activesupport (7.1.3.4)
5+
base64
6+
bigdecimal
57
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
connection_pool (>= 2.2.5)
9+
drb
610
i18n (>= 1.6, < 2)
711
minitest (>= 5.1)
12+
mutex_m
813
tzinfo (~> 2.0)
9-
addressable (2.8.4)
14+
addressable (2.8.6)
1015
public_suffix (>= 2.0.2, < 6.0)
16+
base64 (0.2.0)
17+
bigdecimal (3.1.8)
1118
coffee-script (2.4.1)
1219
coffee-script-source
1320
execjs
14-
coffee-script-source (1.11.1)
21+
coffee-script-source (1.12.2)
1522
colorator (1.1.0)
16-
commonmarker (0.23.9)
17-
concurrent-ruby (1.2.2)
18-
dnsruby (1.70.0)
23+
commonmarker (0.23.10)
24+
concurrent-ruby (1.3.3)
25+
connection_pool (2.4.1)
26+
dnsruby (1.72.1)
1927
simpleidn (~> 0.2.1)
28+
drb (2.2.1)
2029
em-websocket (0.5.3)
2130
eventmachine (>= 0.12.9)
2231
http_parser.rb (~> 0)
2332
ethon (0.16.0)
2433
ffi (>= 1.15.0)
2534
eventmachine (1.2.7)
26-
execjs (2.8.1)
27-
faraday (2.7.4)
35+
execjs (2.9.1)
36+
faraday (2.8.1)
37+
base64
2838
faraday-net_http (>= 2.0, < 3.1)
2939
ruby2_keywords (>= 0.0.4)
3040
faraday-net_http (3.0.2)
31-
ffi (1.15.5)
41+
ffi (1.16.3)
3242
forwardable-extended (2.6.0)
33-
gemoji (3.0.1)
34-
github-pages (228)
35-
github-pages-health-check (= 1.17.9)
36-
jekyll (= 3.9.3)
37-
jekyll-avatar (= 0.7.0)
38-
jekyll-coffeescript (= 1.1.1)
43+
gemoji (4.1.0)
44+
github-pages (231)
45+
github-pages-health-check (= 1.18.2)
46+
jekyll (= 3.9.5)
47+
jekyll-avatar (= 0.8.0)
48+
jekyll-coffeescript (= 1.2.2)
3949
jekyll-commonmark-ghpages (= 0.4.0)
40-
jekyll-default-layout (= 0.1.4)
41-
jekyll-feed (= 0.15.1)
50+
jekyll-default-layout (= 0.1.5)
51+
jekyll-feed (= 0.17.0)
4252
jekyll-gist (= 1.5.0)
43-
jekyll-github-metadata (= 2.13.0)
53+
jekyll-github-metadata (= 2.16.1)
4454
jekyll-include-cache (= 0.2.1)
4555
jekyll-mentions (= 1.6.0)
4656
jekyll-optional-front-matter (= 0.3.2)
@@ -67,28 +77,28 @@ GEM
6777
jekyll-theme-tactile (= 0.2.0)
6878
jekyll-theme-time-machine (= 0.2.0)
6979
jekyll-titles-from-headings (= 0.5.3)
70-
jemoji (= 0.12.0)
71-
kramdown (= 2.3.2)
80+
jemoji (= 0.13.0)
81+
kramdown (= 2.4.0)
7282
kramdown-parser-gfm (= 1.1.0)
7383
liquid (= 4.0.4)
7484
mercenary (~> 0.3)
7585
minima (= 2.5.1)
7686
nokogiri (>= 1.13.6, < 2.0)
77-
rouge (= 3.26.0)
87+
rouge (= 3.30.0)
7888
terminal-table (~> 1.4)
79-
github-pages-health-check (1.17.9)
89+
github-pages-health-check (1.18.2)
8090
addressable (~> 2.3)
8191
dnsruby (~> 1.60)
82-
octokit (~> 4.0)
83-
public_suffix (>= 3.0, < 5.0)
92+
octokit (>= 4, < 8)
93+
public_suffix (>= 3.0, < 6.0)
8494
typhoeus (~> 1.3)
8595
html-pipeline (2.14.3)
8696
activesupport (>= 2)
8797
nokogiri (>= 1.4)
8898
http_parser.rb (0.8.0)
89-
i18n (1.13.0)
99+
i18n (1.14.5)
90100
concurrent-ruby (~> 1.0)
91-
jekyll (3.9.3)
101+
jekyll (3.9.5)
92102
addressable (~> 2.4)
93103
colorator (~> 1.0)
94104
em-websocket (~> 0.5)
@@ -101,27 +111,27 @@ GEM
101111
pathutil (~> 0.9)
102112
rouge (>= 1.7, < 4)
103113
safe_yaml (~> 1.0)
104-
jekyll-avatar (0.7.0)
114+
jekyll-avatar (0.8.0)
105115
jekyll (>= 3.0, < 5.0)
106-
jekyll-coffeescript (1.1.1)
116+
jekyll-coffeescript (1.2.2)
107117
coffee-script (~> 2.2)
108-
coffee-script-source (~> 1.11.1)
118+
coffee-script-source (~> 1.12)
109119
jekyll-commonmark (1.4.0)
110120
commonmarker (~> 0.22)
111121
jekyll-commonmark-ghpages (0.4.0)
112122
commonmarker (~> 0.23.7)
113123
jekyll (~> 3.9.0)
114124
jekyll-commonmark (~> 1.4.0)
115125
rouge (>= 2.0, < 5.0)
116-
jekyll-default-layout (0.1.4)
117-
jekyll (~> 3.0)
118-
jekyll-feed (0.15.1)
126+
jekyll-default-layout (0.1.5)
127+
jekyll (>= 3.0, < 5.0)
128+
jekyll-feed (0.17.0)
119129
jekyll (>= 3.7, < 5.0)
120130
jekyll-gist (1.5.0)
121131
octokit (~> 4.2)
122-
jekyll-github-metadata (2.13.0)
132+
jekyll-github-metadata (2.16.1)
123133
jekyll (>= 3.4, < 5.0)
124-
octokit (~> 4.0, != 4.4.0)
134+
octokit (>= 4, < 7, != 4.4.0)
125135
jekyll-include-cache (0.2.1)
126136
jekyll (>= 3.7, < 5.0)
127137
jekyll-mentions (1.6.0)
@@ -192,38 +202,40 @@ GEM
192202
jekyll (>= 3.3, < 5.0)
193203
jekyll-watch (2.2.1)
194204
listen (~> 3.0)
195-
jemoji (0.12.0)
196-
gemoji (~> 3.0)
205+
jemoji (0.13.0)
206+
gemoji (>= 3, < 5)
197207
html-pipeline (~> 2.2)
198208
jekyll (>= 3.0, < 5.0)
199-
kramdown (2.3.2)
209+
kramdown (2.4.0)
200210
rexml
201211
kramdown-parser-gfm (1.1.0)
202212
kramdown (~> 2.0)
203213
liquid (4.0.4)
204-
listen (3.8.0)
214+
listen (3.9.0)
205215
rb-fsevent (~> 0.10, >= 0.10.3)
206216
rb-inotify (~> 0.9, >= 0.9.10)
207217
mercenary (0.3.6)
208218
minima (2.5.1)
209219
jekyll (>= 3.5, < 5.0)
210220
jekyll-feed (~> 0.9)
211221
jekyll-seo-tag (~> 2.1)
212-
minitest (5.18.0)
213-
nokogiri (1.14.3-x86_64-linux)
222+
minitest (5.23.1)
223+
mutex_m (0.2.0)
224+
nokogiri (1.15.6-x86_64-linux)
214225
racc (~> 1.4)
215226
octokit (4.25.1)
216227
faraday (>= 1, < 3)
217228
sawyer (~> 0.9)
218229
pathutil (0.16.2)
219230
forwardable-extended (~> 2.6)
220-
public_suffix (4.0.7)
221-
racc (1.6.2)
231+
public_suffix (5.0.5)
232+
racc (1.8.0)
222233
rb-fsevent (0.11.2)
223-
rb-inotify (0.10.1)
234+
rb-inotify (0.11.1)
224235
ffi (~> 1.0)
225-
rexml (3.2.5)
226-
rouge (3.26.0)
236+
rexml (3.2.9)
237+
strscan
238+
rouge (3.30.0)
227239
ruby2_keywords (0.0.5)
228240
rubyzip (2.3.2)
229241
safe_yaml (1.0.5)
@@ -235,31 +247,29 @@ GEM
235247
sawyer (0.9.2)
236248
addressable (>= 2.3.5)
237249
faraday (>= 0.17.3, < 3)
238-
simpleidn (0.2.1)
239-
unf (~> 0.1.4)
250+
simpleidn (0.2.3)
251+
strscan (3.1.0)
240252
terminal-table (1.8.0)
241253
unicode-display_width (~> 1.1, >= 1.1.1)
242-
typhoeus (1.4.0)
254+
typhoeus (1.4.1)
243255
ethon (>= 0.9.0)
244256
tzinfo (2.0.6)
245257
concurrent-ruby (~> 1.0)
246-
unf (0.1.4)
247-
unf_ext
248-
unf_ext (0.0.8.2)
249258
unicode-display_width (1.8.0)
250259

251260
PLATFORMS
252261
x86_64-linux
253262

254263
DEPENDENCIES
255-
github-pages (~> 228)
264+
ffi (~> 1.16.3)
265+
github-pages (~> 231)
256266
http_parser.rb (~> 0.6.0)
257-
jekyll (~> 3.9.3)
258-
jekyll-feed (~> 0.15.1)
267+
jekyll (~> 3.9.5)
268+
jekyll-feed (~> 0.17.0)
259269
minima (~> 2.5.1)
260270
tzinfo (>= 1, < 3)
261271
tzinfo-data
262272
wdm (~> 0.1.1)
263273

264274
BUNDLED WITH
265-
2.4.3
275+
2.4.22

0 commit comments

Comments
 (0)