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

Update ruby and gems, remove unused code #502

Merged
merged 2 commits into from
Apr 9, 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
16 changes: 10 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ orbs:
jobs:
login-to-aws:
docker: &docker_image
- image: 'cimg/ruby:3.1.3-node'
- image: 'cimg/ruby:3.2.3-node'
steps:
- checkout
- aws-cli/setup:
Expand All @@ -26,7 +26,7 @@ jobs:
test:
working_directory: ~/circle
docker:
- image: 'cimg/ruby:3.1.3'
- image: 'cimg/ruby:3.2.3'
environment:
RAILS_ENV: test
steps:
Expand Down Expand Up @@ -203,18 +203,22 @@ workflows:
requires:
- deploy_to_test_dev_eks
- deploy_to_test_production_eks
filters:
branches:
only:
- main
- deploy_to_live_dev_eks:
context: *moj-forms-context
requires:
- acceptance_tests
filters:
branches:
only:
- main
- deploy_to_live_production_eks:
context: *moj-forms-context
requires:
- acceptance_tests
filters:
branches:
only:
- main
- smoke_tests:
context: *moj-forms-context
requires:
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.3
3.2.3
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.3-alpine3.17
FROM ruby:3.2.3-alpine3.19

RUN apk add build-base bash libcurl sqlite sqlite-dev sqlite-libs tzdata
RUN apk add --no-cache gcompat
Expand Down
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,18 @@ gem 'redis', '~> 5.0'
gem 'sentry-rails', '~> 5.14'
gem 'sentry-ruby', '~> 5.14'
gem 'jwt'
gem 'sqlite3'

group :development, :test do
gem 'dotenv-rails', require: 'dotenv/rails-now'
gem 'dotenv', require: 'dotenv/load'
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'rspec-rails', '>= 3.5.0'
end

group :development do
gem 'listen'
gem 'guard-rspec', require: false
end

group :test do
gem 'factory_bot_rails', '~> 6.4'
gem 'shoulda-matchers', '~> 5.3'
gem 'simplecov'
gem 'simplecov-console', require: false
end
Expand Down
Loading
Loading