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

Standard Rep: updates ruby version and alpine version #144

Merged
merged 2 commits into from
Oct 7, 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
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.6
2.7.8
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Standard Reports UI: change log

## 1.6.0 - 2024-10

- (Dan) Updates ruby version to 2.7.8 and alpine version to 3.16 [GH-143](https://github.com/epimorphics/standard-reports-ui/issues/143)

## 1.5.4 - 2024-09

- (Jon) Updated the application exceptions controller to instrument the
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ end
# TODO: In production you want to set this to the gem from the epimorphics package repo
source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'json_rails_logger', '~> 1.0.0'
gem 'lr_common_styles', '~> 1.9.0'
gem 'lr_common_styles', '~> 2.0'
end
42 changes: 20 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
GEM
remote: https://rubygems.org/
remote: https://rubygems.pkg.github.com/epimorphics/
specs:
actioncable (5.2.8.1)
actionpack (= 5.2.8.1)
Expand Down Expand Up @@ -145,6 +146,10 @@ GEM
js-routes (1.4.14)
railties (>= 4)
json (2.6.3)
json_rails_logger (1.0.3)
json
lograge
railties
kgio (2.11.4)
leaflet-rails (1.7.0)
rails (>= 4.2.0)
Expand All @@ -162,6 +167,19 @@ GEM
loofah (2.21.3)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lr_common_styles (2.0.0)
bootstrap-sass (~> 3.4.0)
font-awesome-rails (~> 4.7.0.1)
govuk_elements_rails (~> 2.0.0)
govuk_frontend_toolkit (~> 4.18.1)
govuk_template (~> 0.18.1)
haml-rails (~> 2.0.0)
jquery-rails (>= 4.3.5, < 4.7.0)
lodash-rails (~> 4.17.14)
modernizr-rails (~> 2.7.1)
modulejs-rails (~> 2.2.0.0)
rails (>= 5.2.4)
sass-rails (~> 5.0.4)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
Expand Down Expand Up @@ -360,30 +378,10 @@ GEM
nokogiri (~> 1.8)
yajl-ruby (1.4.3)

GEM
remote: https://rubygems.pkg.github.com/epimorphics/
specs:
json_rails_logger (1.0.3)
json
lograge
railties
lr_common_styles (1.9.9)
bootstrap-sass (~> 3.4.0)
font-awesome-rails (~> 4.7.0.1)
govuk_elements_rails (~> 2.0.0)
govuk_frontend_toolkit (~> 4.18.1)
govuk_template (~> 0.18.1)
haml-rails (~> 2.0.0)
jquery-rails (>= 4.3.5, < 4.7.0)
lodash-rails (~> 4.17.14)
modernizr-rails (~> 2.7.1)
modulejs-rails (~> 2.2.0.0)
rails (~> 5.2.4)
sass-rails (~> 5.0.4)

PLATFORMS
-darwin-20
aarch64-linux
ruby
x86_64-darwin-17
x86_64-darwin-21
x86_64-linux
Expand All @@ -405,7 +403,7 @@ DEPENDENCIES
json_rails_logger (~> 1.0.0)!
leaflet-rails
libv8-node (>= 16.10.0.0)
lr_common_styles (~> 1.9.0)!
lr_common_styles (~> 2.0)!
minitest-rails-capybara
minitest-reporters
minitest-spec-rails
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: assets auth check clean image lint local publish realclean run tag test vars

ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account)
ALPINE_VERSION?=3.13
ALPINE_VERSION?=3.16
AWS_REGION?=eu-west-1
BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ')
ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com
Expand Down
4 changes: 2 additions & 2 deletions app/lib/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

module Version
MAJOR = 1
MINOR = 5
PATCH = 4
MINOR = 6
PATCH = 0
SUFFIX = nil
VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}"
end