Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update to Ruby v3.3 and jekyll v4.3 #2364

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/prepare-build-site/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
ruby-version:
description: "Version of ruby to prepare"
required: false
default: "3.1"
default: "3.3"

runs:
using: composite
Expand Down
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ruby '>= 2.6.0'
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem 'jekyll', '~> 4.2.0'
gem 'jekyll', '~> 4.3.0'

# This is needed for GitHub Flavored Markdown
gem 'kramdown-parser-gfm'
Expand All @@ -36,7 +36,7 @@ gem 'minima', '~> 2.5'

# If you have any plugins, put them here!
group :jekyll_plugins do
gem 'jekyll-feed', '~> 0.16'
gem 'jekyll-feed', '~> 0.17'
gem 'jekyll-include-cache'
gem 'jekyll-indico', '~> 0.6.2'
# gem 'jekyll-indico', github: 'iris-hep/jekyll-indico', branch: 'main'
Expand All @@ -59,3 +59,7 @@ gem 'webrick'

# Required on Ruby 2.6 (polyfill)
gem 'ruby-next'

# no longer part of the default gems in Ruby v3.4.0+
gem 'base64' # required by safe_yaml
gem 'csv' # required by Jekyll
199 changes: 148 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,47 +1,94 @@
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
afm (0.2.2)
ast (2.4.2)
async (2.15.3)
console (~> 1.26)
fiber-annotation
io-event (~> 1.6, >= 1.6.5)
base64 (0.2.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.3.3)
diff-lcs (1.5.0)
console (1.27.0)
fiber-annotation
fiber-local (~> 1.1)
json
csv (3.3.0)
diff-lcs (1.5.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
ffi (1.17.0)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-aarch64-linux-musl)
ffi (1.17.0-arm-linux-gnu)
ffi (1.17.0-arm-linux-musl)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86-linux-gnu)
ffi (1.17.0-x86-linux-musl)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux-musl)
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
fiber-storage (1.0.0)
forwardable-extended (2.6.0)
html-proofer (4.4.3)
google-protobuf (4.27.3)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86_64-linux)
bigdecimal
rake (>= 13)
hashery (2.1.2)
html-proofer (5.0.9)
addressable (~> 2.3)
mercenary (~> 0.3)
async (~> 2.1)
nokogiri (~> 1.13)
parallel (~> 1.10)
pdf-reader (~> 2.11)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
io-event (1.6.5)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-include-cache (0.2.1)
Expand All @@ -50,12 +97,13 @@ GEM
jekyll (>= 3.8, < 5.0)
jekyll-last-modified-at (1.3.2)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.7.2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand All @@ -65,35 +113,48 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.6)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86-linux)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
parser (3.1.3.0)
paco (0.2.3)
parallel (1.26.1)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pkg-config (1.5.1)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
pkg-config (1.5.6)
public_suffix (6.0.1)
racc (1.7.3)
racc (1.8.1)
rainbow (3.1.1)
rake (13.0.6)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
regexp_parser (2.6.1)
regexp_parser (2.9.2)
require-hooks (0.2.2)
rexml (3.3.4)
strscan
rouge (3.30.0)
rouge (4.3.0)
rubocop (1.25.1)
parallel (~> 1.10)
parser (>= 3.1.0.0)
Expand All @@ -103,44 +164,80 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.24.0)
parser (>= 3.1.1.0)
rubocop-ast (1.32.0)
parser (>= 3.3.1.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-next (0.15.3)
ruby-next-core (= 0.15.3)
ruby-next-parser (>= 3.1.1.0)
ruby-next (1.0.3)
paco (~> 0.2)
require-hooks (~> 0.2)
ruby-next-core (= 1.0.3)
ruby-next-parser (>= 3.2.2.0)
unparser (~> 0.6.0)
ruby-next-core (0.15.3)
ruby-next-parser (3.1.1.3)
ruby-next-core (1.0.3)
ruby-next-parser (3.2.2.0)
parser (>= 3.0.3.1)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sass-embedded (1.77.8-aarch64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-aarch64-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-gnueabihf)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-musleabihf)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-musl)
google-protobuf (~> 4.26)
strscan (3.1.0)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (1.8.0)
unparser (0.6.4)
unicode-display_width (2.5.0)
unparser (0.6.15)
diff-lcs (~> 1.3)
parser (>= 3.1.0)
webrick (1.7.0)
parser (>= 3.3.0)
webrick (1.8.1)
yell (2.2.2)
zeitwerk (2.6.6)
zeitwerk (2.6.17)

PLATFORMS
ruby
x86_64-darwin-20
x86_64-darwin-21
x86_64-linux
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux
arm-linux-gnu
arm-linux-gnueabihf
arm-linux-musl
arm-linux-musleabihf
arm64-darwin
x86-linux
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
base64
csv
html-proofer
jekyll (~> 4.2.0)
jekyll-feed (~> 0.16)
jekyll (~> 4.3.0)
jekyll-feed (~> 0.17)
jekyll-include-cache
jekyll-indico (~> 0.6.2)
jekyll-last-modified-at
Expand All @@ -155,7 +252,7 @@ DEPENDENCIES
webrick

RUBY VERSION
ruby 2.7.3p183
ruby 3.3.3p89

BUNDLED WITH
2.3.13
2.5.11
6 changes: 3 additions & 3 deletions pages/docs/webdev.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You can always click the edit button to make small edits to the website source,
#### Installing Ruby

Visit [this page](https://jekyllrb.com/docs/installation/) for information about installing Ruby if your current version is too old; the instructions there form the basis for what you see here, and come in variants for all major operating systems.
You should have Ruby 2.6+ for Jekyll; 3.1 recommended and used in CI. You can use rbenv to manage multiple ruby versions. On macOS with homebrew, you'll want:
You should have Ruby 2.6+ for Jekyll; 3.3 recommended and used in CI. You can use rbenv to manage multiple ruby versions. On macOS with homebrew, you'll want:

```bash
brew install rbenv
Expand All @@ -25,13 +25,13 @@ brew install rbenv
You'll need to run `rbenv init` and follow the instructions for your current shell. After you've installed rbenv on your system, use:

```bash
rbenv install 3.1.2
rbenv install 3.3.3
```

to get a current version of ruby. Then, inside the main iris-hep website directory, run:

```bash
rbenv local 3.1.2
rbenv local 3.3.3
```

This will run the Ruby you just built whenever you enter this directory. You'll want to install bundler too:
Expand Down
Loading
Loading