Merge pull request #488 from jrgriffiniii/issues-485-jrgriffiniii-sol…

…r-conf Updates the CircleCI configuration and active-fedora for solr/conf paths
samvera · Aug 21, 2019 · e7136c4 · e7136c4
2 parents 1ea2a17 + 9154137
commit e7136c4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,6 +17,10 @@ jobs:
       active_fedora_version:
         type: string
         default: '>0'
+      solr_config_path:
+        type: string
+        default: '.internal_test_app/solr/conf'
+
     executor:
       name: 'samvera/ruby_fcrepo_solr'
       ruby_version: << parameters.ruby_version >>
@@ -37,10 +41,10 @@ jobs:
           project: hydra-head
 
       - samvera/engine_cart_generate:
-          cache_key: v1-internal-test-app-{{ checksum "hydra-head.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "hydra-core/lib/generators/hydra/head_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+          cache_key: v1-internal-test-app-{{ checksum "hydra-head.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "hydra-core/lib/generators/hydra/head_generator.rb" }}-{{ checksum "spec/test_app_templates/Gemfile.extra" }}-<< parameters.active_fedora_version >>-<< parameters.rails_version >>-<< parameters.ruby_version >>
 
       - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/config
+          solr_config_path: << parameters.solr_config_path >>
 
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
@@ -65,11 +69,7 @@ workflows:
           ruby_version: 2.6.3
           rails_version: 5.1.7
           active_fedora_version: '~>11.5'
-      - 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
@@ -83,11 +83,7 @@ workflows:
           ruby_version: 2.5.5
           rails_version: 5.1.7
           active_fedora_version: '~>11.5'
-      - 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
@@ -101,9 +97,4 @@ workflows:
           ruby_version: 2.4.6
           rails_version: 5.1.7
           active_fedora_version: '~>11.5'
-      - 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/hydra-access-controls/hydra-access-controls.gemspec b/hydra-access-controls/hydra-access-controls.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport', '>= 4', '< 6'
-  gem.add_dependency "active-fedora", '>= 10.0.0', '< 13'
+  gem.add_dependency "active-fedora", '>= 10.0.0'
   gem.add_dependency "blacklight", '>= 5.16'
   gem.add_dependency "blacklight-access_controls", '~> 0.6.0'
   gem.add_dependency 'cancancan', '~> 1.8'

diff --git a/hydra-access-controls/tasks/hydra-access-controls.rake b/hydra-access-controls/tasks/hydra-access-controls.rake
@@ -6,7 +6,7 @@ namespace "hydra-access" do
     fcrepo_params = { port: 8986, verbose: true, managed: true,
                       no_jms: true, fcrepo_home_dir: 'fcrepo4-test-data' }
     SolrWrapper.wrap(solr_params) do |solr|
-      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")) do
+      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "conf")) do
         FcrepoWrapper.wrap(fcrepo_params) do
           Rake::Task['spec'].invoke
         end

diff --git a/hydra-head.gemspec b/hydra-head.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '>= 3.2.6'
 
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'engine_cart', '~> 2.1'
+  s.add_development_dependency 'engine_cart', '~> 2.2'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.6'
   s.add_development_dependency 'rspec-rails'

diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra
@@ -1 +1,5 @@
 gem 'byebug' unless ENV['CI']
+
+if ENV['ACTIVE_FEDORA_VERSION']
+  gem 'active-fedora', ENV['ACTIVE_FEDORA_VERSION']
+end