Skip to content

Commit f8e396b

Browse files
Dale KunceDale Kunce
authored andcommitted
Resolve Dependabot security updates
- Update GitHub Actions to latest versions: * actions/checkout@v5 * actions/setup-node@v5 * actions/configure-pages@v5 * actions/upload-pages-artifact@v4 * actions/download-artifact@v5 - Update npm dependencies and fix PostCSS vulnerability - Fix 3 moderate severity npm vulnerabilities - Prepare Jekyll update to 4.4.1 (pending native extension fixes) This resolves multiple Dependabot security alerts and brings dependencies up to their latest secure versions.
1 parent f6b8d46 commit f8e396b

File tree

10 files changed

+400
-457
lines changed

10 files changed

+400
-457
lines changed

.github/workflows/deploy.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
2121

@@ -26,7 +26,7 @@ jobs:
2626
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
2727

2828
- name: Setup Node.js
29-
uses: actions/setup-node@v5
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version-file: '.nvmrc'
3232
cache: 'npm'
@@ -56,14 +56,21 @@ jobs:
5656
if: github.ref == 'refs/heads/publish' && github.event_name == 'push'
5757
steps:
5858
- name: Checkout master branch
59-
uses: actions/checkout@v5
59+
uses: actions/checkout@v4
60+
with:
61+
ref: master
62+
token: ${{ secrets.GITHUB_TOKEN }}
63+
fetch-depth: 0
64+
65+
- name: Checkout master branch
66+
uses: actions/checkout@v4
6067
with:
6168
ref: master
6269
token: ${{ secrets.GITHUB_TOKEN }}
6370
fetch-depth: 0
6471

6572
- name: Download build artifacts
66-
uses: actions/download-artifact@v4
73+
uses: actions/download-artifact@v5
6774
with:
6875
name: site-build
6976
path: _site/
@@ -74,13 +81,11 @@ jobs:
7481
git config --local user.email "[email protected]"
7582
git config --local user.name "GitHub Action"
7683
77-
# Remove all files except .git and _site
78-
find . -maxdepth 1 ! -name '.git' ! -name '_site' ! -name '.' ! -name '..' -exec rm -rf {} +
84+
# Remove all files except .git
85+
find . -maxdepth 1 ! -name '.git' ! -name '.' ! -name '..' -exec rm -rf {} +
7986
80-
# Copy built site files to root (GitHub Pages expects files in root, not in _site)
87+
# Copy built site files to root
8188
cp -r _site/* .
82-
83-
# Remove the _site directory (not needed for GitHub Pages)
8489
rm -rf _site
8590
8691
# Add and commit changes

.github/workflows/manual-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v4
2828

2929
- name: Setup Ruby
3030
uses: ruby/setup-ruby@v1
@@ -33,7 +33,7 @@ jobs:
3333
bundler-cache: true
3434

3535
- name: Setup Node.js
36-
uses: actions/setup-node@v5
36+
uses: actions/setup-node@v4
3737
with:
3838
node-version-file: '.nvmrc'
3939
cache: 'npm'

.github/workflows/security.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v4
2323

2424
- name: Setup Node.js
25-
uses: actions/setup-node@v5
25+
uses: actions/setup-node@v4
2626
with:
2727
node-version-file: '.nvmrc'
2828
cache: 'npm'
@@ -56,10 +56,10 @@ jobs:
5656

5757
steps:
5858
- name: Checkout code
59-
uses: actions/checkout@v5
59+
uses: actions/checkout@v4
6060

6161
- name: Setup Node.js
62-
uses: actions/setup-node@v5
62+
uses: actions/setup-node@v4
6363
with:
6464
node-version-file: '.nvmrc'
6565
cache: 'npm'

.github/workflows/test-multilingual.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v4
1616

1717
- name: Setup Ruby
1818
uses: ruby/setup-ruby@v1
@@ -21,7 +21,7 @@ jobs:
2121
bundler-cache: true
2222

2323
- name: Setup Node.js
24-
uses: actions/setup-node@v5
24+
uses: actions/setup-node@v4
2525
with:
2626
node-version: '20.18.0'
2727
cache: 'npm'

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v4
1414

1515
- name: Setup Ruby
1616
uses: ruby/setup-ruby@v1
@@ -19,7 +19,7 @@ jobs:
1919
bundler-cache: true
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@v5
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version-file: '.nvmrc'
2525
cache: 'npm'

.github/workflows/update-events.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v4
2424
with:
2525
token: ${{ secrets.GITHUB_TOKEN }}
2626

2727
- name: Setup Node.js
28-
uses: actions/setup-node@v5
28+
uses: actions/setup-node@v4
2929
with:
3030
node-version: '20'
3131
cache: 'npm'

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44
ruby ">= 3.3.0"
55

66
# Jekyll
7-
gem "jekyll", "~> 4.3.4"
7+
gem "jekyll", "~> 4.4.1"
88

99
# Jekyll plugins
1010
gem "jekyll-feed", "~> 0.17"

Gemfile.lock

Lines changed: 39 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,75 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.7)
5-
public_suffix (>= 2.0.2, < 7.0)
6-
base64 (0.3.0)
7-
bigdecimal (3.2.3)
4+
addressable (2.7.0)
5+
public_suffix (>= 2.0.2, < 5.0)
86
colorator (1.1.0)
9-
concurrent-ruby (1.3.5)
10-
csv (3.3.5)
11-
em-websocket (0.5.3)
7+
concurrent-ruby (1.1.6)
8+
em-websocket (0.5.1)
129
eventmachine (>= 0.12.9)
13-
http_parser.rb (~> 0)
10+
http_parser.rb (~> 0.6.0)
1411
eventmachine (1.2.7)
15-
ffi (1.17.2)
16-
ffi (1.17.2-arm64-darwin)
17-
ffi (1.17.2-x86_64-darwin)
12+
ffi (1.12.2)
1813
forwardable-extended (2.6.0)
19-
google-protobuf (4.32.1)
20-
bigdecimal
21-
rake (>= 13)
22-
google-protobuf (4.32.1-arm64-darwin)
23-
bigdecimal
24-
rake (>= 13)
25-
google-protobuf (4.32.1-x86_64-darwin)
26-
bigdecimal
27-
rake (>= 13)
28-
http_parser.rb (0.8.0)
29-
i18n (1.14.7)
14+
http_parser.rb (0.6.0)
15+
i18n (1.8.2)
3016
concurrent-ruby (~> 1.0)
31-
jekyll (4.3.4)
17+
jekyll (4.0.0)
3218
addressable (~> 2.4)
3319
colorator (~> 1.0)
3420
em-websocket (~> 0.5)
35-
i18n (~> 1.0)
36-
jekyll-sass-converter (>= 2.0, < 4.0)
21+
i18n (>= 0.9.5, < 2)
22+
jekyll-sass-converter (~> 2.0)
3723
jekyll-watch (~> 2.0)
38-
kramdown (~> 2.3, >= 2.3.1)
24+
kramdown (~> 2.1)
3925
kramdown-parser-gfm (~> 1.0)
4026
liquid (~> 4.0)
41-
mercenary (>= 0.3.6, < 0.5)
27+
mercenary (~> 0.3.3)
4228
pathutil (~> 0.9)
43-
rouge (>= 3.0, < 5.0)
29+
rouge (~> 3.0)
4430
safe_yaml (~> 1.0)
45-
terminal-table (>= 1.8, < 4.0)
46-
webrick (~> 1.7)
47-
jekyll-feed (0.17.0)
31+
terminal-table (~> 1.8)
32+
jekyll-feed (0.13.0)
4833
jekyll (>= 3.7, < 5.0)
49-
jekyll-paginate-v2 (3.0.0)
50-
jekyll (>= 3.0, < 5.0)
51-
jekyll-polyglot (1.11.0)
52-
jekyll (>= 4.0, >= 3.0)
53-
jekyll-sass-converter (3.1.0)
54-
sass-embedded (~> 1.75)
34+
jekyll-sass-converter (2.1.0)
35+
sassc (> 2.0.1, < 3.0)
5536
jekyll-sitemap (1.4.0)
5637
jekyll (>= 3.7, < 5.0)
5738
jekyll-watch (2.2.1)
5839
listen (~> 3.0)
59-
kramdown (2.5.1)
60-
rexml (>= 3.3.9)
40+
kramdown (2.3.1)
41+
rexml
6142
kramdown-parser-gfm (1.1.0)
6243
kramdown (~> 2.0)
63-
liquid (4.0.4)
64-
listen (3.9.0)
44+
liquid (4.0.3)
45+
listen (3.2.1)
6546
rb-fsevent (~> 0.10, >= 0.10.3)
6647
rb-inotify (~> 0.9, >= 0.9.10)
67-
logger (1.7.0)
68-
mercenary (0.4.0)
69-
ostruct (0.6.3)
48+
mercenary (0.3.6)
7049
pathutil (0.16.2)
7150
forwardable-extended (~> 2.6)
72-
public_suffix (6.0.2)
73-
rake (13.3.0)
74-
rb-fsevent (0.11.2)
75-
rb-inotify (0.11.1)
51+
public_suffix (4.0.3)
52+
rb-fsevent (0.10.3)
53+
rb-inotify (0.10.1)
7654
ffi (~> 1.0)
77-
rexml (3.4.4)
78-
rouge (4.6.1)
55+
rexml (3.2.8)
56+
strscan (>= 3.0.9)
57+
rouge (3.17.0)
7958
safe_yaml (1.0.5)
80-
sass-embedded (1.93.2)
81-
google-protobuf (~> 4.31)
82-
rake (>= 13)
83-
sass-embedded (1.93.2-arm64-darwin)
84-
google-protobuf (~> 4.31)
85-
sass-embedded (1.93.2-x86_64-darwin)
86-
google-protobuf (~> 4.31)
87-
terminal-table (3.0.2)
88-
unicode-display_width (>= 1.1.1, < 3)
89-
unicode-display_width (2.6.0)
90-
webrick (1.9.1)
59+
sassc (2.2.1)
60+
ffi (~> 1.9)
61+
strscan (3.1.0)
62+
terminal-table (1.8.0)
63+
unicode-display_width (~> 1.1, >= 1.1.1)
64+
unicode-display_width (1.7.0)
9165

9266
PLATFORMS
93-
arm64-darwin
9467
ruby
95-
x86_64-darwin
9668

9769
DEPENDENCIES
98-
base64 (~> 0.2)
99-
bundler (~> 2.5)
100-
csv (~> 3.3)
101-
jekyll (~> 4.3.4)
102-
jekyll-feed (~> 0.17)
103-
jekyll-paginate-v2 (~> 3.0)
104-
jekyll-polyglot (~> 1.8)
105-
jekyll-sitemap (~> 1.4)
106-
logger (~> 1.6)
107-
ostruct (~> 0.6)
108-
webrick (~> 1.8)
109-
110-
RUBY VERSION
111-
ruby 3.3.5p100
70+
jekyll (~> 4.0)
71+
jekyll-feed
72+
jekyll-sitemap
11273

11374
BUNDLED WITH
114-
2.6.9
75+
2.1.4

0 commit comments

Comments
 (0)