Skip to content

Commit abb054a

Browse files
authored
ci: add/bump Ruby 3.4, move Node to 22 (just-the-docs#1594)
This involves some explicit adding of gems that were moved out of the default gems: - `base64` and `csv` are needed for both Jekyll 3.9 and Jekyll 4.3 - `bigdecimal` is just needed for Jekyll 3.9 In the ideal case, this gets backported to both Jekyll 3.9 and 4.3 so we don't need custom Gemfiles. But, I'm also okay with adding these manually for now, and then reverting once both get a backport that patches this. Reminds me of webrick!
1 parent 7fc56e2 commit abb054a

File tree

7 files changed

+42
-29
lines changed

7 files changed

+42
-29
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
jekyll-version: [3.9, 4.3]
1818
os: [ubuntu-latest, macos-latest, windows-latest]
19-
ruby-version: ["3.1", "3.2", "3.3"]
19+
ruby-version: ["3.1", "3.2", "3.3", "3.4"]
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup Ruby
4747
uses: ruby/setup-ruby@v1
4848
with:
49-
ruby-version: "3.3"
49+
ruby-version: "3.4"
5050
bundler-cache: false
5151
- name: Bundle Install
5252
run: bundle install
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
ruby-version: ["3.3"]
65+
ruby-version: ["3.4"]
6666
runs-on: ubuntu-latest
6767

6868
steps:
@@ -96,7 +96,7 @@ jobs:
9696

9797
strategy:
9898
matrix:
99-
node-version: [20.x]
99+
node-version: [22.x]
100100

101101
steps:
102102
- uses: actions/checkout@v4

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup Ruby
3535
uses: ruby/setup-ruby@v1
3636
with:
37-
ruby-version: "3.3"
37+
ruby-version: "3.4"
3838
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
3939
cache-version: 0 # Increment this number if you need to re-download cached gems
4040
- name: Setup Pages

.github/workflows/publish-gem.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
name: Publish Ruby Gem
22

3-
on:
4-
workflow_dispatch
3+
on: workflow_dispatch
54

65
jobs:
76
build:
87
name: Publish
98
runs-on: ubuntu-latest
109

1110
steps:
12-
- uses: actions/checkout@v4
13-
- name: Setup Ruby 3.3
14-
uses: ruby/setup-ruby@v1
15-
with:
16-
ruby-version: "3.3"
11+
- uses: actions/checkout@v4
12+
- name: Setup Ruby 3.4
13+
uses: ruby/setup-ruby@v1
14+
with:
15+
ruby-version: "3.4"
1716

18-
- name: Publish to GPR
19-
run: |
20-
mkdir -p $HOME/.gem
21-
touch $HOME/.gem/credentials
22-
chmod 0600 $HOME/.gem/credentials
23-
printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
24-
gem build *.gemspec
25-
gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
26-
env:
27-
GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
28-
OWNER: ${{ github.repository_owner }}
17+
- name: Publish to GPR
18+
run: |
19+
mkdir -p $HOME/.gem
20+
touch $HOME/.gem/credentials
21+
chmod 0600 $HOME/.gem/credentials
22+
printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
23+
gem build *.gemspec
24+
gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
25+
env:
26+
GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
27+
OWNER: ${{ github.repository_owner }}
2928

3029
# Disabled as this does not handle 2FA
3130
# - name: Publish to RubyGems

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
source "https://rubygems.org"
22
gemspec
33

4+
gem "base64"
5+
gem "csv"
6+
47
gem "jekyll-github-metadata", ">= 2.15"
58

69
gem "jekyll-include-cache", group: :jekyll_plugins

Gemfile.lock

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ GEM
1919
fiber-annotation
2020
io-event (~> 1.5, >= 1.5.1)
2121
timers (~> 4.1)
22+
base64 (0.2.0)
2223
bigdecimal (3.1.8)
2324
colorator (1.1.0)
2425
concurrent-ruby (1.3.4)
2526
console (1.25.2)
2627
fiber-annotation
2728
fiber-local (~> 1.1)
2829
json
30+
csv (3.3.2)
2931
em-websocket (0.5.3)
3032
eventmachine (>= 0.12.9)
3133
http_parser.rb (~> 0)
@@ -36,17 +38,17 @@ GEM
3638
faraday-net_http (>= 2.0, < 3.2)
3739
faraday-net_http (3.1.0)
3840
net-http
39-
ffi (1.17.0-arm64-darwin)
40-
ffi (1.17.0-x86_64-linux-gnu)
41+
ffi (1.17.1-arm64-darwin)
42+
ffi (1.17.1-x86_64-linux-gnu)
4143
fiber-annotation (0.2.0)
4244
fiber-local (1.1.0)
4345
fiber-storage
4446
fiber-storage (0.1.0)
4547
forwardable-extended (2.6.0)
46-
google-protobuf (4.28.2-arm64-darwin)
48+
google-protobuf (4.29.3-arm64-darwin)
4749
bigdecimal
4850
rake (>= 13)
49-
google-protobuf (4.28.2-x86_64-linux)
51+
google-protobuf (4.29.3-x86_64-linux)
5052
bigdecimal
5153
rake (>= 13)
5254
hashery (2.1.2)
@@ -104,9 +106,9 @@ GEM
104106
mercenary (0.4.0)
105107
net-http (0.4.1)
106108
uri
107-
nokogiri (1.16.5-arm64-darwin)
109+
nokogiri (1.18.1-arm64-darwin)
108110
racc (~> 1.4)
109-
nokogiri (1.16.5-x86_64-linux)
111+
nokogiri (1.18.1-x86_64-linux-gnu)
110112
racc (~> 1.4)
111113
octokit (6.1.1)
112114
faraday (>= 1, < 3)
@@ -155,7 +157,9 @@ PLATFORMS
155157
x86_64-linux-gnu
156158

157159
DEPENDENCIES
160+
base64
158161
bundler (>= 2.3.5)
162+
csv
159163
html-proofer (~> 5.0)
160164
jekyll-github-metadata (>= 2.15)
161165
jekyll-include-cache

fixtures/Gemfile-jekyll-3.9

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ source "https://rubygems.org"
22

33
gem "jekyll", "~> 3.9"
44

5+
gem "base64"
6+
gem "bigdecimal"
7+
gem "csv"
8+
59
gem "jekyll-seo-tag", ">= 2.0"
610
gem "rake", ">= 12.3.1"
711

fixtures/Gemfile-jekyll-4.3

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ source "https://rubygems.org"
22

33
gem "jekyll", "~> 4.3"
44

5+
gem "base64"
6+
gem "csv"
7+
58
gem "jekyll-seo-tag", ">= 2.0"
69
gem "rake", ">= 12.3.1"
710

0 commit comments

Comments
 (0)