Skip to content

Commit 2ab4f2b

Browse files
authored
Merge pull request #1240 from github/test-fixes
update ruby version in tests to match gh pages version
2 parents e7e937b + 8c85628 commit 2ab4f2b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Ruby
2020
uses: ruby/setup-ruby@v1
2121
with:
22-
ruby-version: 2.7.4
22+
ruby-version: 3.3.4
2323
bundler-cache: true
2424

2525
- name: Run tests

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AllCops:
22
NewCops: enable
3-
TargetRubyVersion: 2.7
3+
TargetRubyVersion: 3.3
44
Exclude:
55
- _site/**/*
66
- vendor/**/*

script/check-approval

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ rows << :separator
5858
eligible = !current && spdx && approved_licenses.include?(license)
5959
rows << ['Eligible', eligible]
6060

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

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def licenses_path
2727
def config
2828
SpecHelper.config ||= begin
2929
config = Jekyll::Configuration.new.read_config_file config_file
30-
config = Jekyll::Utils.deep_merge_hashes(config, source: source)
30+
config = Jekyll::Utils.deep_merge_hashes(config, source:)
3131
Jekyll::Utils.deep_merge_hashes(Jekyll::Configuration::DEFAULTS, config)
3232
end
3333
end

0 commit comments

Comments
 (0)