diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ae66878..42448d31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 >> @@ -38,6 +38,7 @@ jobs: BUNDLE_GEMFILE: << parameters.gemfile >> POSTGRES_PORT: 5432 FEDORA_6_PORT: 8080 + resource_class: medium+ steps: - checkout @@ -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: @@ -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" diff --git a/Rakefile b/Rakefile index 58acc435..cbef8bf7 100644 --- a/Rakefile +++ b/Rakefile @@ -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 diff --git a/spec/support/database_connection.rb b/spec/support/database_connection.rb index 2e81876c..709311ee 100644 --- a/spec/support/database_connection.rb +++ b/spec/support/database_connection.rb @@ -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