Skip to content

Commit

Permalink
Merge branch 'neo4jrb:4.4' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lianowar authored Oct 23, 2024
2 parents 40ba50e + 8c0262a commit aeeba92
Showing 4 changed files with 18 additions and 18 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
@@ -17,33 +17,33 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ jruby, ruby-3.1.5, ruby ]
neo4j: [ 3.5.35, 4.0.12, 4.1.12, 4.2.19, 4.3.23, 4.4.33, 5.19.0 ]
ruby: [ jruby, ruby-3.1.6, ruby ]
neo4j: [ 3.5.35, 4.0.12, 4.1.13, 4.2.19, 4.3.24, 4.4.36, 5.22.0 ]
active_support: [ '' ]
include:
- neo4j: 3.5.35
java-version: 8
- neo4j: 5.19.0
- neo4j: 5.22.0
java-version: 17
options: "-t ~causal"

- neo4j: 5.19.0
ruby: ruby-3.1.5
- neo4j: 5.22.0
ruby: ruby-3.1.6
java-version: 17
options: "-t ~causal"
active_support: 7.0.8.1
- neo4j: 5.19.0
ruby: ruby-3.1.5
active_support: 7.0.8.4
- neo4j: 5.22.0
ruby: ruby-3.1.6
java-version: 17
options: "-t ~causal"
active_support: 6.1.7.7
- neo4j: 5.19.0
ruby: ruby-3.1.5
active_support: 6.1.7.8
- neo4j: 5.22.0
ruby: ruby-3.1.6
java-version: 17
options: "-t ~causal"
active_support: 6.0.6.1
- neo4j: 5.19.0
ruby: ruby-3.1.5
- neo4j: 5.22.0
ruby: ruby-3.1.6
java-version: 17
options: "-t ~causal"
active_support: 5.2.8.1
6 changes: 3 additions & 3 deletions .github/workflows/testkit.yml
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ jobs:
fail-fast: false
matrix:
ruby:
- [jruby, 9.3.4.0]
- [jruby, 9.4.6.0]
- [ruby, 3.1.5]
- [jruby, 9.3.14.0]
- [jruby, 9.4.8.0]
- [ruby, 3.1.6]
tests:
- TESTKIT_TESTS
- STUB_TESTS
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ end.spec 'neo4j-ruby-driver' do
dependency 'jar-dependencies', '= 0.4.1'
dependency 'ruby-maven', '>= 0', :dev

spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver, 4.4.16' }
spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver, 4.4.17' }
spec_extras[:platform] = 'java'
else
require_ruby_version '>= 3.1'
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ def fresh_cluster_composition_fetched(composition_lookup_result)
addresses_to_retain = @routing_table_registry.all_servers.map(&:unicast_stream).reduce(&:+)

composition_lookup_result.resolved_initial_routers&.then do |addresses|
addresses_to_retain << addresses
addresses_to_retain.merge(addresses)
end

@connection_pool.retain_all(addresses_to_retain)

0 comments on commit aeeba92

Please sign in to comment.