Merge da3e3b5 into ec14246

sue445 · Jul 24, 2018 · 098dae3 · 098dae3
2 parents ec14246 + da3e3b5
commit 098dae3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -77,7 +77,9 @@ rspec_steps: &rspec_steps
   - save_cache:
       <<: *save_bundle_cache_option
 
-  - run: ./ci/build.sh
+  - run:
+      command: ./ci/build.sh
+      no_output_timeout: "1h"
 
 build_jobs: &build_jobs
   - checkout_code
@@ -90,11 +92,9 @@ build_jobs: &build_jobs
   - oracle:activerecord:5.1:
       requires:
         - checkout_code
-  # FIXME: only AR 5.2 is very slow...
-  # https://circleci.com/gh/sue445/index_shotgun/99
-  # - oracle:activerecord:5.2:
-  #     requires:
-  #       - checkout_code
+  - oracle:activerecord:5.2:
+      requires:
+        - checkout_code
   - rubocop:
       requires:
         - checkout_code

diff --git a/gemfiles/activerecord_5_2.gemfile b/gemfiles/activerecord_5_2.gemfile
@@ -13,7 +13,11 @@ group :mysql do
 end
 
 group :oracle do
-  gem "activerecord-oracle_enhanced-adapter", "~> 5.2.2"
+  # gem "activerecord-oracle_enhanced-adapter", "~> 5.2.2"
+
+  # https://github.com/rsim/oracle-enhanced/issues/1720#issuecomment-407228848
+  gem "activerecord-oracle_enhanced-adapter", github: "yahonda/oracle-enhanced", branch: "diag1720_release52"
+
   gem "ruby-oci8"
 end