mirror of
https://github.com/github/choosealicense.com
synced 2024-12-30 16:41:45 +01:00
Merge pull request #1240 from github/test-fixes
update ruby version in tests to match gh pages version
This commit is contained in:
commit
2ab4f2b93c
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
AllCops:
|
||||
NewCops: enable
|
||||
TargetRubyVersion: 2.7
|
||||
TargetRubyVersion: 3.3
|
||||
Exclude:
|
||||
- _site/**/*
|
||||
- vendor/**/*
|
||||
|
@ -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"
|
||||
|
||||
|
@ -27,7 +27,7 @@ end
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user