Merge pull request #5 from art19/jlcorbet/scylladb-plus-cassandra-dri…

…ver-bump Jlcorbet/scylladb plus cassandra driver bump
art19 · Jul 10, 2024 · c04f59d · c04f59d
2 parents 243c86b + 3301c81
commit c04f59d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 40
     strategy:
       fail-fast: false
       matrix:
@@ -24,21 +25,10 @@ jobs:
           - "6.1"
           - "7.0"
           - "7.1"
-        cassandra:
-          - "2.2"
-          - "3.0"
-          - "3.11"
-    name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Cassandra ${{ matrix.cassandra }}
-    services:
-      cassandra:
-        image: cassandra:${{ matrix.cassandra }}
-        ports:
-          - 9042:9042
-        options: >-
-          --health-cmd "cqlsh -e 'SHOW VERSION' localhost"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+        scylladb:
+          - "4.3.6"
+          - "4.4.3"
+    name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / ScyllaDB ${{ matrix.scylladb }}
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
     steps:
@@ -49,6 +39,9 @@ jobs:
           bundler-cache: true
         env:
           BUNDLE_RUBYGEMS__PKG__GITHUB__COM: ${{ secrets.GITHUB_TOKEN }}
+      - run: |
+          docker run --name my_scylla_container -d -p 9042:9042 scylladb/scylla:${{ matrix.scylladb }}
+          sleep 30
       - run: |
           bundle exec rake test
         env:

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 # pull the ART19 patched version of cassandra-driver
 source 'https://rubygems.pkg.github.com/art19' do
-  gem 'cassandra-driver', '~> 3.2.5.1'
+  gem 'cassandra-driver', '~> 3.2.5.2'
 end
 
 gemspec

diff --git a/cequel.gemspec b/cequel.gemspec
@@ -30,7 +30,7 @@ DESC
   s.add_runtime_dependency 'activemodel', '>= 4.0'
   s.add_runtime_dependency 'bigdecimal', '~> 3.0'
   # Require the ART19 patched version of cassandra-driver
-  s.add_runtime_dependency 'cassandra-driver', '~> 3.2.5.1'
+  s.add_runtime_dependency 'cassandra-driver', '~> 3.2.5.2'
   s.add_runtime_dependency 'sorted_set', '~> 1.0'
   s.add_development_dependency 'appraisal', '~> 1.0'
   s.add_development_dependency 'wwtd', '~> 0.5'

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -6,7 +6,7 @@ gem "activemodel", "~> 6.0.6"
 
 # pull the ART19 patched version of cassandra-driver
 source 'https://rubygems.pkg.github.com/art19' do
-  gem 'cassandra-driver', '~> 3.2.5.1'
+  gem 'cassandra-driver', '~> 3.2.5.2'
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -6,7 +6,7 @@ gem "activemodel", "~> 6.1"
 
 # pull the ART19 patched version of cassandra-driver
 source 'https://rubygems.pkg.github.com/art19' do
-  gem 'cassandra-driver', '~> 3.2.5.1'
+  gem 'cassandra-driver', '~> 3.2.5.2'
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -6,7 +6,7 @@ gem "activemodel", "~> 7.0"
 
 # pull the ART19 patched version of cassandra-driver
 source 'https://rubygems.pkg.github.com/art19' do
-  gem 'cassandra-driver', '~> 3.2.5.1'
+  gem 'cassandra-driver', '~> 3.2.5.2'
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
@@ -6,7 +6,7 @@ gem "activemodel", "~> 7.1"
 
 # pull the ART19 patched version of cassandra-driver
 source 'https://rubygems.pkg.github.com/art19' do
-  gem 'cassandra-driver', '~> 3.2.5.1'
+  gem 'cassandra-driver', '~> 3.2.5.2'
 end
 
 gemspec :path => "../"
diff --git a/lib/cequel/version.rb b/lib/cequel/version.rb
@@ -5,6 +5,6 @@ module Cequel
   # We publish our fork with a revision number appended to the upstream version.
   #
   # @return [String] the ART19 revision number
-  ART19_REVISION = '1'.freeze
+  ART19_REVISION = '2'.freeze
   VERSION = "3.2.1.#{ART19_REVISION}".freeze
 end