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.

Sign up for GitHub

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

Jump to bottom

update ruby version in tests to match gh pages version #1240

Merged
merged 2 commits into from
Aug 30, 2024
Merged

update ruby version in tests to match gh pages version #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5a9ec
update ruby version in tests to match gh pages version
mlinksva Aug 30, 2024
8c85628
rubocop ruby 3 things
mlinksva Aug 30, 2024
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/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.4
ruby-version: 3.3.4
bundler-cache: true

- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AllCops:
NewCops: enable
TargetRubyVersion: 2.7
TargetRubyVersion: 3.3
Exclude:
- _site/**/*
- vendor/**/*
Expand Down
2 changes: 1 addition & 1 deletion script/check-approval
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ rows << :separator
eligible = !current && spdx && approved_licenses.include?(license)
rows << ['Eligible', eligible]

puts Terminal::Table.new title: "License: #{license}", rows: rows
puts Terminal::Table.new title: "License: #{license}", rows:
puts
puts "Code search: https://github.com/search?q=#{license}+filename%3ALICENSE&type=Code"

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def licenses_path
def config
SpecHelper.config ||= begin
config = Jekyll::Configuration.new.read_config_file config_file
config = Jekyll::Utils.deep_merge_hashes(config, source: source)
config = Jekyll::Utils.deep_merge_hashes(config, source:)
Jekyll::Utils.deep_merge_hashes(Jekyll::Configuration::DEFAULTS, config)
end
end
Expand Down