Run CI on various versions of solr.

cbeer · Sep 25, 2024 · 8118de0 · 8118de0
1 parent 4573985
commit 8118de0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,14 @@ jobs:
           - '3.2.5'
           - '3.3.4'
           - jruby-9.4.8.0
+        solr_version: ['']
+        include:
+          - ruby: '3.3.4'
+            solr_version: ['8.11.4']
+          - ruby: '3.3.4'
+            solr_version: ['9.6.1']
+    env:
+      SOLR_WRAPPER_SOLR_VERSION: ${{ matrix.solr_version }}
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

diff --git a/lib/solr_wrapper/configuration.rb b/lib/solr_wrapper/configuration.rb
@@ -85,7 +85,12 @@ def instance_dir
 
     def version
       @version ||= begin
-        config_version = options.fetch(:version, SolrWrapper.default_instance_options[:version])
+        config_version = if ENV['SOLR_WRAPPER_SOLR_VERSION'].nil? || ENV['SOLR_WRAPPER_SOLR_VERSION'].empty?
+          options.fetch(:version, SolrWrapper.default_instance_options[:version]))
+        else
+          ENV['SOLR_WRAPPER_SOLR_VERSION']
+        end
+
         if config_version == 'latest'
           fetch_latest_version
         else

diff --git a/spec/lib/solr_wrapper/configuration_spec.rb b/spec/lib/solr_wrapper/configuration_spec.rb
@@ -63,6 +63,8 @@
   end
 
   describe '#version' do
+    skip if ENV['SOLR_WRAPPER_SOLR_VERSION']
+
     context 'when it is a version number' do
       let(:options) { { version: 'x.y.z' } }