Merge 2ba39b8 into 0fb51ac

sue445 · Apr 26, 2019 · d849c0b · d849c0b
2 parents 0fb51ac + 2ba39b8
commit d849c0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -127,6 +127,9 @@ build_jobs: &build_jobs
   - oracle_activerecord:
       name:    "oracle_activerecord:5.2"
       gemfile: "activerecord_5_2"
+  - oracle_activerecord:
+      name:    "oracle_activerecord:6.0"
+      gemfile: "activerecord_6_0"
   - rubocop
 
 workflows:

diff --git a/gemfiles/activerecord_6_0.gemfile b/gemfiles/activerecord_6_0.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0.beta1"
+gem "activerecord", "~> 6.0.0.rc1"
 
 group :postgresql do
   # c.f. https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
@@ -13,8 +13,7 @@ group :mysql do
 end
 
 group :oracle do
-  # TODO: Edit version after activerecord-oracle_enhanced-adapter supports rails 6.0
-  # gem "activerecord-oracle_enhanced-adapter", "~> 5.2.3"
+  gem "activerecord-oracle_enhanced-adapter", "~> 6.0.0.rc1"
   gem "ruby-oci8"
 end