Fix CI failures
This commit is contained in:
parent
04134fa830
commit
e6a2420e32
|
@ -14,7 +14,7 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
|
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
|
||||||
ruby: [2.6, 2.7, '3.0', 3.1, 'jruby-9.3']
|
ruby: [2.6, 2.7, '3.0', 'jruby-9.3']
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: ruby/setup-ruby@v1
|
- uses: ruby/setup-ruby@v1
|
||||||
|
|
|
@ -124,7 +124,11 @@ module Sinatra
|
||||||
raise UnsupportedConfigType unless ['.yml', '.yaml', '.erb'].include?(File.extname(file))
|
raise UnsupportedConfigType unless ['.yml', '.yaml', '.erb'].include?(File.extname(file))
|
||||||
logger.info "loading config file '#{file}'" if logging? && respond_to?(:logger)
|
logger.info "loading config file '#{file}'" if logging? && respond_to?(:logger)
|
||||||
document = ERB.new(IO.read(file)).result
|
document = ERB.new(IO.read(file)).result
|
||||||
yaml = YAML.load(document)
|
yaml = begin
|
||||||
|
YAML.load(document, aliases: true)
|
||||||
|
rescue ArgumentError
|
||||||
|
YAML.load(document)
|
||||||
|
end
|
||||||
config = config_for_env(yaml)
|
config = config_for_env(yaml)
|
||||||
config.each_pair { |key, value| set(key, value) }
|
config.each_pair { |key, value| set(key, value) }
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue