From 76b4c3ecc4fb902edbf0b4ae86f0e86b350a5999 Mon Sep 17 00:00:00 2001 From: Trey Pendragon Date: Mon, 5 Dec 2022 11:49:54 -0800 Subject: [PATCH 1/3] Fix YAML.safe_load syntax for Ruby 2.7+ --- Rakefile | 2 +- spec/support/database_connection.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 495861d9efc31ce34a4893320be5a63e30abd84f Mon Sep 17 00:00:00 2001 From: Trey Pendragon Date: Mon, 5 Dec 2022 13:15:38 -0800 Subject: [PATCH 2/3] Stop testing Ruby 2.5. --- .circleci/config.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ae66878..d4638125 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 >> @@ -122,10 +122,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 +155,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" From 571a24e6c04ffb3fd3964bfcd48c4f7925d5cb84 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Wed, 7 Dec 2022 13:13:24 -0500 Subject: [PATCH 3/3] Bump up CircleCI resource_class to give more memory to build environment (especially fcrepo) --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4638125..42448d31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,7 @@ jobs: BUNDLE_GEMFILE: << parameters.gemfile >> POSTGRES_PORT: 5432 FEDORA_6_PORT: 8080 + resource_class: medium+ steps: - checkout