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

Bump Ruby to v3.1.2 #339

Merged
merged 6 commits into from
Nov 2, 2022
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
22 changes: 22 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
version: 2
updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: weekly
day: sunday
open-pull-requests-limit: 5
versioning-strategy: auto
labels:
- dependencies

- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: sunday
open-pull-requests-limit: 5
versioning-strategy: auto
labels:
- dependencies
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.0
ruby-version: 3.1.2
-
name: Set up ruby gem cache
uses: actions/cache@v1
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 3.1.0
nodejs 17.6.0
ruby 3.1.2
nodejs 18.11.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ------------------------------------------------------------------------------
# Base
# ------------------------------------------------------------------------------
FROM ruby:3.1.0-alpine as base
FROM ruby:3.1.2-alpine as base

RUN apk add --no-cache --no-progress build-base less curl tzdata gcompat \
"busybox>=1.34.1-r5" \
Expand Down Expand Up @@ -41,7 +41,7 @@ RUN bundle config set without development test ui
RUN bundle install --no-binstubs --retry=10 --jobs=4

# ------------------------------------------------------------------------------
# Production Stage - nodejs v16.14.2, postgresql v13.6
# Production Stage - nodejs v16.17.1, postgresql v14.5, chromium v102.0.5005.182
# ------------------------------------------------------------------------------
FROM base AS app

Expand Down
22 changes: 11 additions & 11 deletions 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.1.0'
ruby '3.1.2'

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '>= 7.0.4'
Expand All @@ -10,10 +10,10 @@ gem 'rails', '>= 7.0.4'
gem 'sprockets-rails'

# Use postgresql as the database for Active Record
gem 'pg', '~> 1.1'
gem 'pg'

# Use the Puma web server [https://github.com/puma/puma]
gem 'puma', '~> 5.6'
gem 'puma'

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem 'importmap-rails'
Expand All @@ -39,20 +39,20 @@ gem 'bootsnap', require: false
gem 'devise'

# HTML abstraction markup language
gem 'slim-rails', '~> 3.4', '>= 3.4.0'
gem 'slim-rails'

# Create models from static data such as hashes or YAML
gem 'active_hash'

# TODO: add ey-recovery to https://github.com/DFE-Digital/govuk-components
gem 'govuk-components', '>= 3.0.3'
gem 'govuk-components'
gem 'govuk_design_system_formbuilder'

# Markdown support
gem 'govspeak', '~> 6.8', '>= 6.8.2'
gem 'sassc', '~> 2.4' # govspeak assets
gem 'govspeak'
gem 'sassc' # govspeak assets

gem 'govuk_notify_rails', '~> 2.2', '>= 2.2.0'
gem 'govuk_notify_rails'

# Sentry -Monitor errors
gem 'sentry-rails'
Expand All @@ -65,17 +65,17 @@ gem 'uk_postcode'
gem 'dibber'

# Track users
gem 'ahoy_matey', '~> 4.0'
gem 'ahoy_matey'

# PDF generator middleware
gem 'grover', '~> 1.1'
gem 'grover'

# Pa11y accessibility testing
gem 'sitemap_generator'

group :development, :test do
# Use fake data for specs
gem 'dotenv-rails', '~> 2.7', '>= 2.7.6'
gem 'dotenv-rails'
gem 'faker'
gem 'foreman'
gem 'pry-byebug'
Expand Down
Loading