Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EL-1695: Upgrade Ruby to 3.3.4 #1527

Merged
merged 4 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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:
- image: checkclientqualifiesdocker/circleci-image:puppeteer-2215
- image: checkclientqualifiesdocker/circleci-image:EL-1695-upgrade-ruby
auth:
username: $DOCKERHUB_USER_CCQ
password: $DOCKERHUB_PAT_CCQ
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/browser_tools_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- EL-1695-upgrade-ruby
- puppeteer-2215

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.3.4
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_browser_tools.dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.3.1p55
ruby 3.3.4p94

BUNDLED WITH
2.5.9
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```
Expand Down