From 7c8cc448b0b8b01d10f2c5c401bcbd515d815482 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Tue, 4 Jun 2024 10:27:24 +0100 Subject: [PATCH 1/2] Updates for Rails 7.2.0.beta1 release --- Dockerfile.ci | 2 +- VERSION | 2 +- activerecord-sqlserver-adapter.gemspec | 2 +- docker-compose.ci.yml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index f9437e97d..0ded95afd 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,6 +9,6 @@ WORKDIR $WORKDIR COPY . $WORKDIR -RUN RAILS_BRANCH=7-2-stable bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 +RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 CMD ["sh"] diff --git a/VERSION b/VERSION index 2031da2af..f987ae52f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0.alpha +7.2.0.beta1 diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index 3d603b673..8da422d79 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -27,6 +27,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "activerecord", "~> 7.2.0.alpha" + spec.add_dependency "activerecord", "~> 7.2.0.beta1" spec.add_dependency "tiny_tds" end diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 957b5ec9b..cbc842619 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -5,7 +5,6 @@ services: ci: environment: - ACTIVERECORD_UNITTEST_HOST=sqlserver - - RAILS_BRANCH=7-2-stable build: context: . dockerfile: Dockerfile.ci From 313e5f15a8864f06b7bdb42848ef863affdb54ac Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Wed, 5 Jun 2024 18:50:38 +0100 Subject: [PATCH 2/2] Rails 7.2.0.beta2 --- VERSION | 2 +- activerecord-sqlserver-adapter.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f987ae52f..de4dd5c4e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0.beta1 +7.2.0.beta2 diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index 8da422d79..3e71c7422 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -27,6 +27,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "activerecord", "~> 7.2.0.beta1" + spec.add_dependency "activerecord", "~> 7.2.0.beta2" spec.add_dependency "tiny_tds" end