From a6fa64778975bac16c8ff722a68d4b61afa4be6f Mon Sep 17 00:00:00 2001 From: Hassan Mir Date: Mon, 17 Mar 2025 10:15:12 +0000 Subject: [PATCH 1/2] Upgrade ruby to 3.4.2 --- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 4 ++-- Gemfile | 2 +- Gemfile.lock | 2 +- db/schema.rb | 2 +- docs/diagram.pdf | Bin 71644 -> 71644 bytes 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ruby-version b/.ruby-version index a0891f563f..4d9d11cf50 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.2 diff --git a/.tool-versions b/.tool-versions index 6bb71f9a85..7d42937913 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,6 +2,6 @@ azure-cli 2.51.0 kubectl 1.27.3 nodejs 22.2.0 postgres 14.9 -ruby 3.3.4 +ruby 3.4.2 terraform 1.5.0 yarn 1.22.19 diff --git a/Dockerfile b/Dockerfile index b0b6396b7f..eff82c4976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # production: runs the actual app # Build builder image -FROM ruby:3.3.4-alpine as builder +FROM ruby:3.4.2-alpine as builder WORKDIR /app @@ -62,7 +62,7 @@ RUN rm -rf node_modules log/* tmp/* /tmp && \ find /usr/local/bundle/gems -name "*.html" -delete # Build runtime image -FROM ruby:3.3.4-alpine as production +FROM ruby:3.4.2-alpine as production # The application runs from /app WORKDIR /app diff --git a/Gemfile b/Gemfile index c6a2dff9de..23c4ec1312 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.4" +ruby "3.4.2" gem "rails", "~> 8.0" diff --git a/Gemfile.lock b/Gemfile.lock index 1755d0f907..aa1e82b6cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -771,7 +771,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.3.4p94 + ruby 3.4.2p28 BUNDLED WITH 2.4.10 diff --git a/db/schema.rb b/db/schema.rb index e64b5926b4..2cc8c3dc51 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -153,8 +153,8 @@ t.text "recommendation_assessor_note", default: "", null: false t.boolean "references_verified" t.boolean "scotland_full_registration" - t.text "qualifications_assessor_note", default: "", null: false t.boolean "unsigned_consent_document_generated", default: false, null: false + t.text "qualifications_assessor_note", default: "", null: false t.index ["application_form_id"], name: "index_assessments_on_application_form_id" end diff --git a/docs/diagram.pdf b/docs/diagram.pdf index 5bbe2e4991ef73ab9e08a78f6937a3aded43857e..5bede04afe06c8f2efb4fab3eefe45f431314396 100644 GIT binary patch delta 278 zcmV+x0qOqSuLRt$1c0;w2Ni#)>$1omR$(cnAZ|}BJ%kwCKrxcU(*5_H=(?rkG#~Tw z-b)xzQgSFL;lT18DKp4QMyd+Zx7(y3ZN;D*0f6*H_YOXQ1BDJg7gU>h^uWmRxF}j{ z`dKOqkrdh*U=4K6HC73)&DaR9AZmXOobrNZtYnns zMfo0Y_x~k=Cv*+cR#+7xgis53RlOD`^Mgq#9?tg^8|}(R;?bkPLHrz!G*ya)@r;kM5YJGwrPyZ(6#<*glSzYpfDpo1qq7K~#SqIpsT=v7E7t zvEn^m@Bd2#Pv{z?jj$?22%%>1syZ#s<_D8fJe(gWHrf|k;=!Z9LB1(2)=VRmWf;P| zxXg4#SEN=9ZVYbnzT#)_c2et9;a07_wN&lp93Z9+yj9LjRw@VC=6OY-^hu!g)2^Im<0UgqY82|tP From ffde0d163f4892a80c44cf3fb06a6c165690b74b Mon Sep 17 00:00:00 2001 From: Hassan Mir Date: Mon, 17 Mar 2025 10:20:55 +0000 Subject: [PATCH 2/2] Go back to 3.3.0 as it was more stable and compatible with postgres14 --- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 4 ++-- Gemfile | 2 +- Gemfile.lock | 2 +- docs/diagram.pdf | Bin 71644 -> 71643 bytes 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4d9d11cf50..15a2799817 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.2 +3.3.0 diff --git a/.tool-versions b/.tool-versions index 7d42937913..95f9314574 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,6 +2,6 @@ azure-cli 2.51.0 kubectl 1.27.3 nodejs 22.2.0 postgres 14.9 -ruby 3.4.2 +ruby 3.3.0 terraform 1.5.0 yarn 1.22.19 diff --git a/Dockerfile b/Dockerfile index eff82c4976..5fbd9a6967 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # production: runs the actual app # Build builder image -FROM ruby:3.4.2-alpine as builder +FROM ruby:3.3.0-alpine as builder WORKDIR /app @@ -62,7 +62,7 @@ RUN rm -rf node_modules log/* tmp/* /tmp && \ find /usr/local/bundle/gems -name "*.html" -delete # Build runtime image -FROM ruby:3.4.2-alpine as production +FROM ruby:3.3.0-alpine as production # The application runs from /app WORKDIR /app diff --git a/Gemfile b/Gemfile index 23c4ec1312..779a9930a6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.4.2" +ruby "3.3.0" gem "rails", "~> 8.0" diff --git a/Gemfile.lock b/Gemfile.lock index aa1e82b6cb..4834cd9a4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -771,7 +771,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.4.2p28 + ruby 3.3.0p0 BUNDLED WITH 2.4.10 diff --git a/docs/diagram.pdf b/docs/diagram.pdf index 5bede04afe06c8f2efb4fab3eefe45f431314396..7bf158625f8a9be53226b2fdbb719cd618de0ee6 100644 GIT binary patch delta 312 zcmV-80muH_uLRq#1c0;w2Ni$luFE2OScRpOg19}k^blfj1I0)ZOZVS*qN}CklKGf7 z?@hvhl7hpI5)LfilOltxV5BS|eY=ke(nj>k5dcVEbm!m$I8bQeb4Hb!1`mv!PP3x1 zrkkX)5J{n}0hX{sl0$U!essq)ooR2yc+=7)#`bZ%jIm01ZH8KS1yO%}FgGnhK&JPqf+80~m!K1)Iz9}x&Oe2(KC_=rs z%ydOpq*e@W3~uti;%D%7QfpOVSFOIaRPE&)Af^tyRnAOSDhJu-c}1c0OL&K0@NdCN zc=2WW$A0+ykM*$W7g+=7Zibf$76BjuHJ2(D0iFe-ZnsF1m(3Od$1omR$(cnAZ|}BJ%kwCKrxcU(*5_H=(?rkG#~Tw z-b)xzQgSFL;lT18DKp4QMyd+Zx7(y3ZN;D*0f6*H_YOXQ1BDJg7gU>h^uWmRxF}j{ z`dKOqkrdh*U=4K6HC73)&DaR9AZmXOobrNZtYnns zMfo0Y_x~k=Cv*+cR#+7xgis53RlOD`^Mgq#9?tg^8|}(R;?bkPLH