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

Upgrade ruby 2.7 -> 3.2, jekyll 3.8.7 -> 4.3.2 #460

Closed
wants to merge 2 commits into from
Closed
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/ruby:2.7-node
- image: cimg/ruby:3.2.2-node
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:

deploy:
docker:
- image: circleci/ruby:2.7-node
- image: cimg/ruby:3.2.2-node
environment:
GITHUB_REPO: caciviclab/odca-jekyll
steps:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
3.2.2
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ gem "mini_magick"
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem "jekyll-seo-tag"
gem "jekyll-assets"
gem "jekyll-sass-converter", "< 3.0" # 3.0+ has a build error in "neat" SCSS framework
# TODO: Use next published jekyll-assets release
# https://github.com/envygeeks/jekyll-assets/issues/660
gem "jekyll-assets", git: 'https://github.com/envygeeks/jekyll-assets'
gem 'jekyll-redirect-from'
end

Expand Down
196 changes: 119 additions & 77 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,133 +1,175 @@
GIT
remote: https://github.com/envygeeks/jekyll-assets
revision: 056d2c88719ef3b1f90967a606dd1441581dd832
specs:
jekyll-assets (4.0.0.alpha)
activesupport (>= 5, < 7)
execjs (~> 2.7)
extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
jekyll (>= 3.5, < 5.0)
jekyll-sanity (~> 1.2)
liquid-tag-parser (>= 1, < 3)
nokogiri (~> 1.10)
pathutil (~> 0.16)
sassc (>= 1.11, < 3.0)
sprockets (~> 4.0.beta7)

GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.4.4)
Ascii85 (1.1.0)
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
async (2.6.4)
console (~> 1.10)
fiber-annotation
io-event (~> 1.1)
timers (~> 4.1)
colorator (1.1.0)
concurrent-ruby (1.1.7)
em-websocket (0.5.1)
concurrent-ruby (1.2.2)
console (1.23.2)
fiber-annotation
fiber-local
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
http_parser.rb (~> 0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.7.0)
execjs (2.9.0)
extras (0.3.0)
forwardable-extended (~> 2.5)
fastimage (2.1.3)
ffi (1.13.1)
fastimage (2.2.7)
ffi (1.15.5)
fiber-annotation (0.2.0)
fiber-local (1.0.0)
forwardable-extended (2.6.0)
html-proofer (3.16.0)
hashery (2.1.2)
html-proofer (5.0.8)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
parallel (~> 1.3)
async (~> 2.1)
nokogiri (~> 1.13)
pdf-reader (~> 2.11)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (3.8.7)
io-event (1.3.2)
jekyll (4.3.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
jekyll-assets (3.0.11)
activesupport (~> 5.0)
execjs (~> 2.7)
extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
jekyll (>= 3.5, < 4.0)
jekyll-sanity (~> 1.2)
liquid-tag-parser (~> 1.0)
nokogiri (~> 1.8)
pathutil (~> 0.16)
sprockets (>= 3.3, < 4.1.beta)
jekyll-feed (0.10.0)
jekyll (~> 3.3)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sanity (1.2.0)
jekyll (~> 3.1)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.5.0)
jekyll (~> 3.3)
jekyll-sanity (1.6.0)
jekyll (>= 3.1, < 5.0)
pathutil (~> 0.16)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (1.17.0)
liquid (4.0.3)
liquid-tag-parser (1.9.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
liquid-tag-parser (2.0.2)
extras (~> 0.3)
liquid (>= 3.0, < 5.0)
listen (3.2.1)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_magick (4.9.4)
mini_portile2 (2.4.0)
minitest (5.14.2)
neat (3.0.0)
sass (~> 3.4)
mercenary (0.4.0)
mini_magick (4.12.0)
mini_portile2 (2.8.4)
minitest (5.20.0)
neat (4.0.0)
thor (~> 0.19)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.19.2)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
rack (2.2.3)
rainbow (3.0.0)
rake (12.3.3)
rb-fsevent (0.10.4)
pdf-reader (2.11.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
public_suffix (5.0.3)
racc (1.7.1)
rack (3.0.8)
rainbow (3.1.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.20.0)
rexml (3.2.6)
rouge (4.1.3)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
sass (3.5.7)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
scss_lint (0.57.0)
rake (>= 0.9, < 13)
sass (~> 3.5.5)
sprockets (3.7.2)
sassc (2.4.0)
ffi (~> 1.9)
scss_lint (0.60.0)
sass (~> 3.5, >= 3.5.5)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
thor (0.20.0)
thread_safe (0.3.6)
rack (>= 2.2.4, < 4)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (0.20.3)
timers (4.3.5)
ttfunk (1.7.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
webrick (1.8.1)
yell (2.2.2)
zeitwerk (2.6.11)

PLATFORMS
ruby

DEPENDENCIES
html-proofer
jekyll (>= 3.7)
jekyll-assets
jekyll-assets!
jekyll-feed (~> 0.6)
jekyll-redirect-from
jekyll-sass-converter (< 3.0)
jekyll-seo-tag
mini_magick
neat
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ clean:
npm run gulp -- clean

production: $(SVGS)
npm run dist
NODE_OPTIONS=--openssl-legacy-provider npm run dist
JEKYLL_ENV=production bundle exec jekyll build

pull-finance:
Expand Down
Loading