Removing the work-around for AF 10.x release tests; Removing AF 10.3.…

…x tests from the CircleCI build configuration
samvera · Aug 21, 2019 · 9154137 · 9154137
1 parent 40e5cf6
commit 9154137
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,12 +70,6 @@ workflows:
           rails_version: 5.1.7
           active_fedora_version: '~>11.5'
           solr_config_path: '.internal_test_app/solr/config'
-      - bundle_and_test:
-          name: "ruby2-6_rails5.0_AF10"
-          ruby_version: 2.6.3
-          rails_version: 5.0.7.2
-          active_fedora_version: '~>10.3'
-          solr_config_path: '.internal_test_app/solr/config'
       - bundle_and_test:
           name: "ruby2-5_rails5.2"
           ruby_version: 2.5.5
@@ -90,12 +84,6 @@ workflows:
           rails_version: 5.1.7
           active_fedora_version: '~>11.5'
           solr_config_path: '.internal_test_app/solr/config'
-      - bundle_and_test:
-          name: "ruby2-5_rails5.0_AF10"
-          ruby_version: 2.5.5
-          rails_version: 5.0.7.2
-          active_fedora_version: '~>10.3'
-          solr_config_path: '.internal_test_app/solr/config'
       - bundle_and_test:
           name: "ruby2-4_rails5.2"
           ruby_version: 2.4.6
@@ -110,9 +98,3 @@ workflows:
           rails_version: 5.1.7
           active_fedora_version: '~>11.5'
           solr_config_path: '.internal_test_app/solr/config'
-      - bundle_and_test:
-          name: "ruby2-4_rails5.0_AF10"
-          ruby_version: 2.4.6
-          rails_version: 5.0.7.2
-          active_fedora_version: '~>10.3'
-          solr_config_path: '.internal_test_app/solr/config'
diff --git a/Gemfile b/Gemfile
@@ -44,9 +44,5 @@ if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5/
 end
 
 if ENV['ACTIVE_FEDORA_VERSION']
-  if ENV['ACTIVE_FEDORA_VERSION'] =~ /10.3/
-    gem 'active-fedora', git: 'https://github.com/jrgriffiniii/active_fedora.git', branch: 'solr7-fix-10.3'
-  else
-    gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
-  end
+  gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
 end
diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra
@@ -1,9 +1,5 @@
 gem 'byebug' unless ENV['CI']
 
 if ENV['ACTIVE_FEDORA_VERSION']
-  if ENV['ACTIVE_FEDORA_VERSION'] =~ /10.3/
-    gem 'active-fedora', git: 'https://github.com/jrgriffiniii/active_fedora.git', branch: 'solr7-fix-10.3'
-  else
-    gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
-  end
+  gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
 end