From 46f572c3628d2049b5751a2c9735949071afe9ff Mon Sep 17 00:00:00 2001 From: Hettie Street Date: Wed, 4 Sep 2024 17:52:02 +0100 Subject: [PATCH 1/3] EL-1695: Upgrade Ruby to 3.3.4 --- .circleci/config.yml | 4 ++-- .github/workflows/rubocop.yml | 2 +- .ruby-version | 2 +- Dockerfile | 4 ++-- Dockerfile_browser_tools.dockerfile | 4 ++-- Gemfile | 2 +- Gemfile.lock | 2 +- README.md | 6 ++---- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ba06056d..5b3967365 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ executors: basic-executor: resource_class: small docker: - - image: cimg/ruby:3.3.1-browsers + - image: cimg/ruby:3.3.4-browsers test-executor: resource_class: medium docker: @@ -28,7 +28,7 @@ executors: e2e-executor: resource_class: small docker: - - image: cimg/ruby:3.3.1-browsers + - image: cimg/ruby:3.3.4-browsers environment: VCR_RECORD_MODE: none COVERAGE: true diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 3a72f4a44..1732cbd1a 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.1 + ruby-version: 3.3.4 bundler-cache: true - name: Run RuboCop diff --git a/.ruby-version b/.ruby-version index bea438e9a..a0891f563 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.1 +3.3.4 diff --git a/Dockerfile b/Dockerfile index 9210207c9..0571d8fee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # production: runs the actual app # Build builder image -FROM ruby:3.3.1-bookworm as builder +FROM ruby:3.3.4-bookworm as builder WORKDIR /app @@ -46,7 +46,7 @@ RUN chown -R appuser:appgroup /app USER 1000 # Build runtime image -FROM ruby:3.3.1-slim-bookworm as production +FROM ruby:3.3.4-slim-bookworm as production # The application runs from /app WORKDIR /app diff --git a/Dockerfile_browser_tools.dockerfile b/Dockerfile_browser_tools.dockerfile index 765646d08..5ed895d10 100644 --- a/Dockerfile_browser_tools.dockerfile +++ b/Dockerfile_browser_tools.dockerfile @@ -1,6 +1,6 @@ # Build custom docker image for test-executor -# Use the cimg/ruby:3.3.1-browsers image as the base image to extend out -FROM cimg/ruby:3.3.1-browsers +# Use the cimg/ruby:3.3.4-browsers image as the base image to extend out +FROM cimg/ruby:3.3.4-browsers WORKDIR /app diff --git a/Gemfile b/Gemfile index 4f361b217..cc90930e3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.1" +ruby "3.3.4" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.1.3" diff --git a/Gemfile.lock b/Gemfile.lock index 8c8cb5bc4..0e3486bde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -636,7 +636,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.3.1p55 + ruby 3.3.4p94 BUNDLED WITH 2.5.9 diff --git a/README.md b/README.md index fbb05420c..a6f754919 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Currently CCQ only enables checks relating to civil legal aid; however a future - Ruby version - - Ruby version 3.1.3 - - Rails 7.0.x + - Ruby version 3.3.4 + - Rails 7.1.x - System dependencies - postgres @@ -43,8 +43,6 @@ brew services start postgresql@14 You will also need pdftk. There is a [Mac installer](https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk_server-2.02-mac_osx-10.11-setup.pkg) for convenience. -If you are running Ruby version 3.1.3, then [Bundler](https://bundler.io/) should already be installed. You may run into an error here if you are not using the correct Ruby version: - ``` bundle install ``` From b89080b8d922c12bb23fc63af575ce5e3a5eb717 Mon Sep 17 00:00:00 2001 From: Hettie Street Date: Wed, 4 Sep 2024 18:27:17 +0100 Subject: [PATCH 2/3] Update browser tools docker image --- .github/workflows/browser_tools_docker_image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/browser_tools_docker_image.yml b/.github/workflows/browser_tools_docker_image.yml index d0b24a164..59d19db86 100644 --- a/.github/workflows/browser_tools_docker_image.yml +++ b/.github/workflows/browser_tools_docker_image.yml @@ -3,6 +3,7 @@ on: push: branches: - main + - EL-1695-upgrade-ruby - puppeteer-2215 jobs: From 776dd78bd9cbe1715d0ddd7125d1279bc7ad7f27 Mon Sep 17 00:00:00 2001 From: Hettie Street Date: Wed, 4 Sep 2024 18:35:43 +0100 Subject: [PATCH 3/3] Update docker image in test executor --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b3967365..b117c9bc1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ executors: test-executor: resource_class: medium docker: - - image: checkclientqualifiesdocker/circleci-image:puppeteer-2215 + - image: checkclientqualifiesdocker/circleci-image:EL-1695-upgrade-ruby auth: username: $DOCKERHUB_USER_CCQ password: $DOCKERHUB_PAT_CCQ