Skip to content

Fix YAML.safe_load syntax for Ruby 2.7+ #916

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

Merged
cjcolvar merged 3 commits into from
Dec 7, 2022
Merged

Fix YAML.safe_load syntax for Ruby 2.7+ #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76b4c3e
Fix YAML.safe_load syntax for Ruby 2.7+
tpendragon Dec 5, 2022
495861d
Stop testing Ruby 2.5.
tpendragon Dec 5, 2022
571a24e
Bump up CircleCI resource_class to give more memory to build environm…
cjcolvar Dec 7, 2022
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
11 changes: 2 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
type: "string"
ruby:
description: "Ruby version"
default: "2.6.5"
default: "2.7.0"
type: "string"
docker:
- image: cimg/ruby:<< parameters.ruby >>
Expand Down Expand Up @@ -38,6 +38,7 @@ jobs:
BUNDLE_GEMFILE: << parameters.gemfile >>
POSTGRES_PORT: 5432
FEDORA_6_PORT: 8080
resource_class: medium+
steps:
- checkout

Expand Down Expand Up @@ -122,10 +123,6 @@ workflows:
gemfile: "gemfiles/activerecord_5_2.gemfile"
ruby: 2.6.5
name: "Ruby2-6_Rails5-2"
- build:
gemfile: "gemfiles/activerecord_5_2.gemfile"
ruby: 2.5.7
name: "Ruby2-5_Rails5-2"
nightly:
triggers:
- schedule:
Expand Down Expand Up @@ -159,7 +156,3 @@ workflows:
gemfile: "gemfiles/activerecord_5_2.gemfile"
ruby: 2.6.5
name: "Ruby2-6_Rails5-2"
- build:
gemfile: "gemfiles/activerecord_5_2.gemfile"
ruby: 2.5.7
name: "Ruby2-5_Rails5-2"
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace :db do
end

task configuration: :environment do
@config = YAML.safe_load(ERB.new(File.read("db/config.yml")).result, [], [], true)[DATABASE_ENV]
@config = YAML.safe_load(ERB.new(File.read("db/config.yml")).result, aliases: true)[DATABASE_ENV]
end

task configure_connection: :configuration do
Expand Down
2 changes: 1 addition & 1 deletion spec/support/database_connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def self.connect!(env)
# Ref https://github.com/puma/puma#clustered-mode
ActiveSupport.on_load(:active_record) do
::ActiveRecord::Base.connection_pool.disconnect! if ::ActiveRecord::Base.connected?
::ActiveRecord::Base.configurations = YAML.safe_load(ERB.new(File.read("db/config.yml")).result, [], [], true) || {}
::ActiveRecord::Base.configurations = YAML.safe_load(ERB.new(File.read("db/config.yml")).result, aliases: true) || {}
::ActiveRecord::Base.establish_connection(DatabaseConnection.database_config(env))
end
end
Expand Down