Merge pull request #221 from jespersandnielsen/development

Update Circleci workflow

Author: riggleg

.circleci/config.yml

@@ -3,9 +3,11 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: circleci/<< parameters.ruby_version >>
-      - image: circleci/postgres:9.6.2-alpine
-      - image: circleci/mysql:5.7
+      - image: << parameters.ruby_version >>
+      - image: postgres:11.19-alpine
+        environment:
+          POSTGRES_HOST_AUTH_METHOD: "trust"
+      - image: mysql:5.7
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     parameters:
@@ -32,12 +34,16 @@ jobs:
       #       - vendor/bundle
 
       - run:
-          name: Install postgres client
-          command: sudo apt install -y postgresql-client
+          name: Update apt
+          command: apt update -y
+
+      - run:
+          name: Install dependencies
+          command: apt install -y curl postgresql-client default-mysql-client
 
       - run:
-          name: Install mysql client
-          command: sudo apt install -y default-mysql-client
+          name: Install dockerize
+          command: curl -sfL $(curl -s https://api.github.com/repos/powerman/dockerize/releases/latest | grep -i /dockerize-$(uname -s)-$(uname -m)\" | cut -d\" -f4) | install /dev/stdin /usr/local/bin/dockerize
 
       - run:
           name: Configure config database.yml
@@ -69,10 +75,12 @@ workflows:
       - build:
           matrix:
             parameters:
-              ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster", "ruby:3.0-buster"]
+              ruby_version: ["ruby:2.7-buster", "ruby:3.0-buster", "ruby:3.1-buster", "ruby:3.2-buster"]
               gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile", "gemfiles/rails_6_1.gemfile", "gemfiles/rails_7_0.gemfile"]
             exclude:
               - ruby_version: "ruby:3.0-buster"
                 gemfile: "gemfiles/rails_5_2.gemfile"
-              - ruby_version: "ruby:2.6-buster"
-                gemfile: "gemfiles/rails_7_0.gemfile"
+              - ruby_version: "ruby:3.1-buster"
+                gemfile: "gemfiles/rails_5_2.gemfile"
+              - ruby_version: "ruby:3.2-buster"
+                gemfile: "gemfiles/rails_5_2.gemfile"

.ruby-version

@@ -1 +1 @@
-2.7.5
+2.7.7

gemfiles/rails_7_0.gemfile

@@ -9,9 +9,9 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 61.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+  gem "activerecord-jdbc-adapter", "~> 70.1"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 70.1"
+  gem "activerecord-jdbcmysql-adapter", "~> 70.1"
 end
 
 gemspec path: "../"

gemfiles/rails_master.gemfile

@@ -9,9 +9,9 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 61.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+  gem "activerecord-jdbc-adapter", "~> 70.1"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 70.1"
+  gem "activerecord-jdbcmysql-adapter", "~> 70.1"
 end
 
 gemspec path: "../"