Merge pull request #3008 from TracksApp/default_ruby

Make 3.1 our default build

.github/workflows/continuous-integration.yml

@@ -8,6 +8,11 @@ jobs:
       matrix:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
         db: [sqlite, mysql, postgres]
+        exclude:
+          - ruby: "3.2"
+            db: sqlite
+          - ruby: "3.2"
+            db: postgres
 
     steps:
       - uses: actions/checkout@v1

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0
+FROM ruby:3.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -13,7 +13,7 @@ RUN bundle install --jobs 4
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn netcat
+RUN apt-get update && apt-get install -y yarn netcat-openbsd
 
 RUN mkdir /app/log
 

Dockerfile-3.1 → Dockerfile-3.0

@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.0
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1

test-envs/docker-compose-3.0-mysql.yml

@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

test-envs/docker-compose-3.0-postgres.yml

@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

test-envs/docker-compose-3.0-sqlite.yml

@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

test-envs/docker-compose-3.1-mysql.yml

@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

test-envs/docker-compose-3.1-postgres.yml

@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

test-envs/docker-compose-3.1-sqlite.yml

@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV