Skip to content

Commit e9bd13f

Browse files
Copilothenryiii
andauthored
chore: Incorporate upstream changes from PR #1728 (rebase)
Co-authored-by: henryiii <4616906+henryiii@users.noreply.github.com>
1 parent ead9e52 commit e9bd13f

4 files changed

Lines changed: 185 additions & 132 deletions

File tree

.github/actions/prepare-build-site/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
ruby-version:
55
description: "Version of ruby to prepare"
66
required: false
7-
default: "3.3"
7+
default: "3.4"
88

99
runs:
1010
using: composite
@@ -13,9 +13,9 @@ runs:
1313
uses: actions/cache@v3
1414
with:
1515
path: vendor/bundle
16-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
16+
key: ${{ runner.os }}-gems-${{ inputs.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}
1717
restore-keys: |
18-
${{ runner.os }}-gems-
18+
${{ runner.os }}-gems-${{ inputs.ruby-version }}-
1919
2020
- name: Restore publication cache
2121
uses: actions/cache@v3

Gemfile

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

33
source 'https://rubygems.org'
44

5-
ruby '>= 2.6.0'
5+
ruby '>= 3.1.0'
66

77
# Hello! This is where you manage which Jekyll version is used to run.
88
# When you want to use a different version, change it below, save the
@@ -12,7 +12,7 @@ ruby '>= 2.6.0'
1212
#
1313
# This will help ensure the proper Jekyll version is running.
1414
# Happy Jekylling!
15-
gem 'jekyll', '~> 4.3.0'
15+
gem 'jekyll'
1616

1717
# This is needed for GitHub Flavored Markdown
1818
gem 'kramdown-parser-gfm'
@@ -25,20 +25,24 @@ group :development do
2525
gem 'rake', require: false
2626

2727
# Verify good coding practices in Ruby files
28-
gem 'rubocop', '~>1.25.0', require: false
28+
gem 'rubocop', require: false
2929

3030
# Extension for Rake files
3131
gem 'rubocop-rake', require: false
3232
end
3333

3434
# This is the default theme for new Jekyll sites. You may change this to anything you like.
35-
gem 'minima', '~> 2.5'
35+
gem 'minima'
36+
37+
# Removed from the stdlib
38+
gem 'benchmark'
39+
gem 'logger'
3640

3741
# If you have any plugins, put them here!
3842
group :jekyll_plugins do
39-
gem 'jekyll-feed', '~> 0.17'
43+
gem 'jekyll-feed'
4044
gem 'jekyll-include-cache'
41-
gem 'jekyll-indico', '~> 0.6.2'
45+
gem 'jekyll-indico'
4246
# gem 'jekyll-indico', github: 'iris-hep/jekyll-indico', branch: 'main'
4347
end
4448

@@ -49,10 +53,10 @@ gem 'jekyll-last-modified-at'
4953
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
5054

5155
# Needed by Nokogiri
52-
gem 'pkg-config', '~> 1.4'
56+
gem 'pkg-config'
5357

5458
# Performance-booster for watching directories on Windows
55-
gem 'wdm', '~> 0.1.0' if Gem.win_platform?
59+
gem 'wdm' if Gem.win_platform?
5660

5761
# Required on Ruby 3+ (next Jekyll will fix this missing dep)
5862
gem 'webrick'

0 commit comments

Comments
 (0)