Upgrade to Ruby 3.0 and Ubuntu 22.04

unboxed · Feb 9, 2024 · b9066e3 · b9066e3
1 parent 3e4b14d
commit b9066e3
Show file tree

Hide file tree

Showing 25 changed files with 1,555 additions and 1,040 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -11,8 +11,9 @@ runs:
     - name: Install gems
       shell: bash
       run: |
-        gem install bundler -v 1.17.3
-        bundle install --jobs 4 --retry 3 --path vendor/bundle
+        gem install bundler -v 2.3.27
+        bundle config set --local path 'vendor/bundle'
+        bundle install --jobs 4 --retry 3
 
     - name: Setup database
       shell: bash

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   bundle-audit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -32,15 +32,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -50,7 +50,7 @@ jobs:
           bundle exec rake bundle:audit
 
   brakeman:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -74,15 +74,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -92,7 +92,7 @@ jobs:
           bundle exec rake brakeman:check
 
   spec-admin-controllers:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -116,15 +116,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -138,7 +138,7 @@ jobs:
           bundle exec rake spec:controllers
 
   spec-public-controllers:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -162,15 +162,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -184,7 +184,7 @@ jobs:
           bundle exec rake spec:controllers
 
   spec-jobs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -208,15 +208,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -230,7 +230,7 @@ jobs:
           bundle exec rake spec:jobs
 
   spec-mailers:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -254,15 +254,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -276,7 +276,7 @@ jobs:
           bundle exec rake spec
 
   spec-models:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -300,15 +300,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -322,7 +322,7 @@ jobs:
           bundle exec rake spec
 
   spec-requests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -346,15 +346,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -368,7 +368,7 @@ jobs:
           bundle exec rake spec
 
   spec-other:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -392,15 +392,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -414,7 +414,7 @@ jobs:
           bundle exec rake spec
 
   javascript:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -438,15 +438,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -459,7 +459,7 @@ jobs:
           bundle exec rake jasmine:ci
 
   cucumber-admin:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -483,15 +483,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -506,7 +506,7 @@ jobs:
           bundle exec rake cucumber
 
   cucumber-public:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
@@ -530,15 +530,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.0"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-20.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-20.04-gems-
+            ubuntu-22.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup

diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'dotenv-rails', require: 'dotenv/rails-now'
 gem 'rails', '6.1.7.6'
 
 gem 'rake'
-gem 'pg'
+gem 'pg', '< 1.5'
 gem 'authlogic'
 gem 'will_paginate'
 gem 'json'
@@ -34,6 +34,7 @@ gem 'image_processing'
 gem 'maxminddb'
 gem 'redcarpet'
 gem 'scrypt'
+gem 'webrick'
 
 gem 'aws-sdk-codedeploy'
 gem 'aws-sdk-cloudwatchlogs'