Merge pull request #1161 from DFE-Digital/rollback_ruby_upgrade

Revert ruby 3 upgrade

.github/workflows/brakeman-analysis.yml

@@ -23,9 +23,9 @@ jobs:
 
     # Customize the ruby version depending on your needs
     - name: Setup Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1.82.0
       with:
-        ruby-version: '3.0.2'
+        ruby-version: '2.7.2'
 
     - name: Setup Brakeman
       env:

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/[email protected]
         with:
-          ruby-version: 3.0.2
+          ruby-version: 2.7.2
       - name: Install dependencies
         run: bundle install
       - name: Create mail log file

.github/workflows/smoke_test.yml

@@ -54,7 +54,7 @@ jobs:
         uses: ruby/[email protected]
         with:
           bundler-cache: true
-          ruby-version: '3.0.2'
+          ruby-version: '2.7.2'
 
       - name: Set up Node
         uses: actions/[email protected]

.github/workflows/test.yml

@@ -52,7 +52,7 @@ jobs:
         uses: ruby/[email protected]
         with:
           bundler-cache: true
-          ruby-version: '3.0.2'
+          ruby-version: '2.7.2'
 
       - name: Set up Node
         uses: actions/[email protected]
@@ -154,7 +154,7 @@ jobs:
         uses: ruby/[email protected]
         with:
           bundler-cache: true
-          ruby-version: '3.0.2'
+          ruby-version: '2.7.2'
 
       - name: Set up Node
         uses: actions/[email protected]

.ruby-version

@@ -1 +1 @@
-3.0.2
+2.7.2

Dockerfile

@@ -1,13 +1,13 @@
 # To use or update to a ruby version, change {BASE_RUBY_IMAGE}
-ARG BASE_RUBY_IMAGE=ruby:3.0.2-alpine3.14
+ARG BASE_RUBY_IMAGE=ruby:2.7.2-alpine
 # BASE_RUBY_IMAGE_WITH_GEMS_AND_NODE_MODULES will default to early-careers-framework-gems-node-modules
 # building all layers above it if a value is not specidied during the build
 ARG BASE_RUBY_IMAGE_WITH_GEMS_AND_NODE_MODULES=early-careers-framework-gems-node-modules
 
 # Stage 1: Download gems and node modules.
 FROM ${BASE_RUBY_IMAGE} AS builder
 
-ARG BUILD_DEPS="git gcc libc-dev make nodejs yarn postgresql-dev build-base libxml2-dev libxslt-dev ttf-freefont"
+ARG BUILD_DEPS="git gcc libc-dev make nodejs yarn postgresql-dev build-base libxml2-dev libxslt-dev ttf-ubuntu-font-family"
 
 WORKDIR /app
 

Dockerfile.dev

@@ -1,5 +1,5 @@
 # To use or update to a ruby version, change {BASE_RUBY_IMAGE}
-ARG BASE_RUBY_IMAGE=ruby:3.0.2-alpine3.14
+ARG BASE_RUBY_IMAGE=ruby:2.7.2-alpine
 # BASE_RUBY_IMAGE_WITH_GEMS_AND_NODE_MODULES will default to early-careers-framework-gems-node-modules
 # building all layers above it if a value is not specidied during the build
 ARG BASE_RUBY_IMAGE_WITH_GEMS_AND_NODE_MODULES=early-careers-framework-gems-node-modules

README.md

@@ -7,7 +7,7 @@
 
 ### Prerequisites
 
-- Ruby 3.0.2
+- Ruby 2.7.2
 - PostgreSQL (we deploy on 11.x)
 - NodeJS 14.16.0
 - Yarn 1.12.x

app/forms/participants/participant_validation_form.rb

@@ -6,7 +6,7 @@ class ParticipantValidationForm
     include ActiveModel::Model
 
     # lifted from https://github.com/dwp/nino-format-validation
-    NINO_REGEX = /(^(?!BG)(?!GB)(?!NK)(?!KN)(?!TN)(?!NT)(?!ZZ)[A-Z&&[^DFIQUV]][A-Z&&[^DFIOQUV]][0-9]{6}[A-D]$)/
+    NINO_REGEX = /(^(?!BG)(?!GB)(?!NK)(?!KN)(?!TN)(?!NT)(?!ZZ)[A-Z&&[^DFIQUV]][A-Z&&[^DFIOQUV]][0-9]{6}[A-D]$)/.freeze
     attr_accessor :step,
                   :do_you_want_to_add_mentor_information_choice,
                   :do_you_know_your_trn_choice,

app/services/invite_schools.rb

@@ -29,9 +29,8 @@ def run(school_urns)
   end
 
   def reached_limit(school)
-    EMAIL_LIMITS.find do |args|
-      args => { max:, within: }
-      NominationEmail.where(school: school, sent_at: within.ago..Float::INFINITY).count >= max
+    EMAIL_LIMITS.find do |**kwargs|
+      NominationEmail.where(school: school, sent_at: kwargs[:within].ago..Float::INFINITY).count >= kwargs[:max]
     end
   end
 

app/services/record_declarations/base.rb

@@ -9,7 +9,7 @@ class Base
     implement_class_method :required_params, :valid_declaration_types
     implement_instance_method :user_profile
 
-    RFC3339_DATE_REGEX = /\A\d{4}-\d{2}-\d{2}T(\d{2}):(\d{2}):(\d{2})([.,]\d+)?(Z|[+-](\d{2})(:?\d{2})?)?\z/i
+    RFC3339_DATE_REGEX = /\A\d{4}-\d{2}-\d{2}T(\d{2}):(\d{2}):(\d{2})([.,]\d+)?(Z|[+-](\d{2})(:?\d{2})?)?\z/i.freeze
 
     attr_accessor :declaration_date, :declaration_type
 

app/validators/notify_email_validator.rb

@@ -2,9 +2,9 @@
 
 # Notify email validation https://github.com/alphagov/notifications-utils/blob/acbe764fb7f12c7a8b0696156283fbcb5073fcd7/notifications_utils/recipients.py#L494
 class NotifyEmailValidator < ActiveModel::EachValidator
-  HOSTNAME_PART_REGEX = /\A(xn|[a-z0-9]+)(-?-[a-z0-9]+)*\z/i
-  TLD_REGEX = /\A([a-z]{2,63}|xn--([a-z0-9]+-)*[a-z0-9]+)\z/i
-  EMAIL_REGEX = /\A[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~\\-]+@([^.@][^@\s]+)\z/
+  HOSTNAME_PART_REGEX = /\A(xn|[a-z0-9]+)(-?-[a-z0-9]+)*\z/i.freeze
+  TLD_REGEX = /\A([a-z]{2,63}|xn--([a-z0-9]+-)*[a-z0-9]+)\z/i.freeze
+  EMAIL_REGEX = /\A[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~\\-]+@([^.@][^@\s]+)\z/.freeze
 
   def validate_each(record, attribute, value)
     record.errors.add(attribute, I18n.t("errors.email.invalid")) unless NotifyEmailValidator.valid?(value)

lib/tasks/school_urn_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ALL_URNS = (1..999_999) unless defined?(ALL_URNS)
+ALL_URNS = (1..999_999).freeze unless defined?(ALL_URNS)
 
 class SchoolURNGenerator
   class << self

lib/tasks/trn_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ALL_TRNS = (1111..9_999_999) unless defined?(ALL_TRNS)
+ALL_TRNS = (1111..9_999_999).freeze unless defined?(ALL_TRNS)
 
 class TRNGenerator
   class << self

lib/tasks/valid_test_data_generator.rb

@@ -111,7 +111,7 @@ def weighted_choice(selection:, odds:)
 
   class AmbitionSpecificPopulater < LeadProviderPopulater
     class << self
-      FIRST_AMBITION_SEED_DATA_TIME = ("2021-08-18 13:43".."2021-08-18 13:49")
+      FIRST_AMBITION_SEED_DATA_TIME = ("2021-08-18 13:43".."2021-08-18 13:49").freeze
 
       def call(name:, total_schools: 3, participants_per_school: 3000)
         generator = new(name: name)