From 364ed55f55388b3be364302615d8e871fc6ab71f Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Mon, 21 Oct 2024 10:00:03 +0100 Subject: [PATCH 1/2] Update activerecord-sqlserver-adapter.gemspec --- activerecord-sqlserver-adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index 94badc3b2..b842832f1 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", "~> 8.0.0.rc1" + spec.add_dependency "activerecord", "~> 8.0.0.rc" spec.add_dependency "tiny_tds" end From 6a64966735098d03181e7ff6168a8f2cbff0f125 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Mon, 21 Oct 2024 10:06:24 +0100 Subject: [PATCH 2/2] Rails 8.0.0.rc1 --- .devcontainer/Dockerfile | 2 +- Dockerfile.ci | 2 +- activerecord-sqlserver-adapter.gemspec | 2 +- docker-compose.ci.yml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6d4c1a2af..116b439f1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -25,6 +25,6 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/t RUN mkdir -p /tmp/activerecord-sqlserver-adapter COPY Gemfile VERSION activerecord-sqlserver-adapter.gemspec /tmp/activerecord-sqlserver-adapter/ RUN cd /tmp/activerecord-sqlserver-adapter \ - && RAILS_BRANCH=main bundle install \ + && bundle install \ && rm -rf /tmp/activerecord-sqlserver-adapter RUN chown -R vscode:vscode /usr/local/rvm diff --git a/Dockerfile.ci b/Dockerfile.ci index 74f636508..0ded95afd 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,6 +9,6 @@ WORKDIR $WORKDIR COPY . $WORKDIR -RUN RAILS_BRANCH=main 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/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index b842832f1..94badc3b2 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", "~> 8.0.0.rc" + spec.add_dependency "activerecord", "~> 8.0.0.rc1" spec.add_dependency "tiny_tds" end diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index f339681e7..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=main build: context: . dockerfile: Dockerfile.ci