Merge branch 'main' into support-annotate-as-tags

googleapis · Nov 3, 2023 · b438205 · b438205
2 parents 9555bc7 + af940ac
commit b438205
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 30 deletions.
diff --git a/.github/workflows/acceptance-tests-on-emulator.yaml b/.github/workflows/acceptance-tests-on-emulator.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
         ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
         # Exclude combinations that are not supported.
         exclude:
@@ -28,8 +28,6 @@ jobs:
             ar: "~> 6.0.6"
           - ruby: "3.2"
             ar: "~> 6.0.6"
-          - ruby: "2.6"
-            ar: "~> 7.0.4"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
         ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
         # Exclude combinations that are not supported.
         exclude:
@@ -20,8 +20,6 @@ jobs:
             ar: "~> 6.0.6"
           - ruby: "3.2"
             ar: "~> 6.0.6"
-          - ruby: "2.6"
-            ar: "~> 7.0.4"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

diff --git a/.github/workflows/nightly-acceptance-tests-on-emulator.yaml b/.github/workflows/nightly-acceptance-tests-on-emulator.yaml
@@ -19,7 +19,7 @@ jobs:
       max-parallel: 4
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [2.6, 2.7, 3.0, 3.1, 3.2]
+        ruby: [2.7, 3.0, 3.1, 3.2]
         ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5, 7.0.6, 7.0.7]
         # Exclude combinations that are not supported.
         exclude:
@@ -53,18 +53,6 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.2
             ar: 6.0.4
-          - ruby: 2.6
-            ar: 7.0.2.4
-          - ruby: 2.6
-            ar: 7.0.3.1
-          - ruby: 2.6
-            ar: 7.0.4
-          - ruby: 2.6
-            ar: 7.0.5
-          - ruby: 2.6
-            ar: 7.0.6
-          - ruby: 2.6
-            ar: 7.0.7
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

diff --git a/.github/workflows/nightly-unit-tests.yaml b/.github/workflows/nightly-unit-tests.yaml
@@ -11,7 +11,7 @@ jobs:
       max-parallel: 4
       matrix:
         # Run unit tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [2.6, 2.7, 3.0, 3.1, 3.2]
+        ruby: [2.7, 3.0, 3.1, 3.2]
         ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5]
         # Exclude combinations that are not supported.
         exclude:
@@ -45,14 +45,6 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.2
             ar: 6.0.4
-          - ruby: 2.6
-            ar: 7.0.2.4
-          - ruby: 2.6
-            ar: 7.0.3.1
-          - ruby: 2.6
-            ar: 7.0.4
-          - ruby: 2.6
-            ar: 7.0.5
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

diff --git a/activerecord-spanner-adapter.gemspec b/activerecord-spanner-adapter.gemspec
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 2.7"
 
-  spec.add_dependency "google-cloud-spanner", "~> 2.10"
+  spec.add_dependency "google-cloud-spanner", "~> 2.18"
   spec.add_runtime_dependency "activerecord", [">= 6.0.0", "< 7.1"]
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"