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 all dependencies that are outstanding #89

Merged
merged 3 commits into from
Mar 13, 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
4 changes: 2 additions & 2 deletions .github/actions/deploy-environment-to-aks/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
using: composite

steps:
- uses: hashicorp/setup-terraform@v1
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.5.4
terraform_wrapper: false
Expand All @@ -47,7 +47,7 @@ runs:
DOCKER_IMAGE: ${{ inputs.docker-image }}
PULL_REQUEST_NUMBER: ${{ inputs.pull-request-number }}

- uses: Azure/login@v1
- uses: Azure/login@v2
with:
creds: ${{ inputs.azure-credentials }}

Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/aks_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.2
ruby-version: 3.3.0

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.20.0'

Expand All @@ -66,7 +66,7 @@ jobs:
run: sudo apt-get install -y libproj-dev proj-bin

- name: Set up ruby gem cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -86,7 +86,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Set up yarn cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -112,20 +112,20 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.2
ruby-version: 3.3.0

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.20.0'

- name: Set up ruby gem cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down Expand Up @@ -156,20 +156,20 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.2
ruby-version: 3.3.0

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.20.0'

- name: Set up ruby gem cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
outputs:
docker-image: ${{ steps.build-docker-image.outputs.image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: DFE-Digital/github-actions/build-docker-image@master
id: build-docker-image
Expand All @@ -221,7 +221,7 @@ jobs:
environment:
name: review
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/deploy-environment-to-aks
id: deploy
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
outputs:
docker-image: ${{ needs.docker.outputs.docker-image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/deploy-environment-to-aks
id: deploy
Expand All @@ -268,7 +268,7 @@ jobs:
name: sandbox

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/deploy-environment-to-aks
id: deploy
Expand All @@ -287,7 +287,7 @@ jobs:
name: production

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/deploy-environment-to-aks
id: deploy
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/aks_destroy_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest
environment: review
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: Azure/login@v1
- uses: Azure/login@v2
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- uses: hashicorp/setup-terraform@v2
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.5.4
terraform_wrapper: false
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.2
ruby-3.3.0
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.1.2-alpine as builder
FROM ruby:3.3.0-alpine as builder

RUN apk -U upgrade && \
apk add --update --no-cache gcc git libc6-compat libc-dev make nodejs \
Expand Down Expand Up @@ -56,7 +56,7 @@ RUN rm -rf node_modules log/* tmp/* /tmp && \
find /usr/local/bundle/gems -name "*.html" -delete

# Build runtime image
FROM ruby:3.1.2-alpine as production
FROM ruby:3.3.0-alpine as production

# The application runs from /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.1.2"
ruby "3.3.0"

gem "activerecord-postgis-adapter"
gem "bootsnap", require: false
gem "bundler", "~> 2.4"
gem 'geocoder'
gem "pg", "~> 1.1"
gem "puma", "~> 5.0"
gem "puma", "~> 6.4"
gem "rails", "~> 7.0.8"
gem "rgeo"
gem "rgeo-geojson"
Expand Down
32 changes: 17 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ GEM
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
childprocess (5.0.0)
coderay (1.1.3)
concurrent-ruby (1.2.3)
crack (1.0.0)
Expand All @@ -105,19 +106,19 @@ GEM
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.5.1)
dotenv (3.0.2)
dotenv-rails (3.0.2)
dotenv (= 3.0.2)
dotenv (3.1.0)
dotenv-rails (3.1.0)
dotenv (= 3.1.0)
railties (>= 6.1)
erubi (1.12.0)
geocoder (1.8.2)
globalid (1.2.1)
activesupport (>= 6.1)
govuk-components (5.0.2)
govuk-components (5.2.1)
html-attributes-utils (~> 1.0.0, >= 1.0.0)
pagy (~> 6.0)
view_component (>= 3.9, < 3.10)
govuk_design_system_formbuilder (5.0.0)
view_component (>= 3.9, < 3.11)
govuk_design_system_formbuilder (5.2.0)
actionview (>= 6.1)
activemodel (>= 6.1)
activesupport (>= 6.1)
Expand All @@ -128,15 +129,16 @@ GEM
i18n (1.14.4)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.11.2)
irb (1.12.0)
rdoc
reline (>= 0.4.2)
jsbundling-rails (1.3.0)
railties (>= 6.0.0)
json (2.7.1)
language_server-protocol (3.17.0.3)
launchy (2.5.2)
launchy (3.0.0)
addressable (~> 2.8)
childprocess (~> 5.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand Down Expand Up @@ -170,7 +172,7 @@ GEM
parser (3.3.0.5)
ast (~> 2.4.1)
racc
pg (1.5.5)
pg (1.5.6)
prettier_print (1.2.1)
propshaft (0.8.0)
actionpack (>= 7.0.0)
Expand All @@ -186,7 +188,7 @@ GEM
psych (5.1.2)
stringio
public_suffix (5.0.4)
puma (5.6.8)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8.1)
Expand Down Expand Up @@ -225,7 +227,7 @@ GEM
rdoc (6.6.2)
psych (>= 4.0.0)
regexp_parser (2.9.0)
reline (0.4.2)
reline (0.4.3)
io-console (~> 0.5)
rexml (3.2.6)
rgeo (3.0.1)
Expand Down Expand Up @@ -256,7 +258,7 @@ GEM
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.13.0)
rspec-support (3.13.1)
rubocop (1.60.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -306,7 +308,7 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
vcr (6.2.0)
view_component (3.9.0)
view_component (3.10.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand Down Expand Up @@ -356,7 +358,7 @@ DEPENDENCIES
propshaft
pry
pry-byebug
puma (~> 5.0)
puma (~> 6.4)
rails (~> 7.0.8)
rgeo
rgeo-geojson
Expand All @@ -373,7 +375,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.1.2p20
ruby 3.3.0p0

BUNDLED WITH
2.4.13
3 changes: 2 additions & 1 deletion app/assets/stylesheets/application.sass.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
$govuk-global-styles: true;
$govuk-new-link-styles: true;
$govuk-new-typography-scale: true;
$govuk-assets-path: "/";

@import "govuk-frontend/govuk/all";
@import "govuk-frontend/dist/govuk/all";
mattonfoot marked this conversation as resolved.
Show resolved Hide resolved

.hub-results {
border-top: 1px solid govuk-colour("mid-grey");
Expand Down
12 changes: 6 additions & 6 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
<%= tag :meta, property: 'og:image', content: asset_path('images/govuk-opengraph-image.png') %>
<%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
<%= favicon_link_tag asset_path('images/favicon.ico') %>
<%= favicon_link_tag asset_path('images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %>
<%= favicon_link_tag asset_path('images/favicon.ico'), size: '48x48' %>
<%= favicon_link_tag asset_path('images/favicon.ico'), type: 'image/svg+xml', size: 'any' %>
<%= favicon_link_tag asset_path('images/govuk-icon-mask.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
<%= favicon_link_tag asset_path('images/govuk-icon-180.png'), rel: 'apple-touch-icon', type: 'image/png' %>
<%= favicon_link_tag asset_path('images/govuk-icon-192.png'), rel: 'apple-touch-icon', type: 'image/png', size: '192x192' %>
<%= favicon_link_tag asset_path('images/govuk-icon-512.png'), rel: 'apple-touch-icon', type: 'image/png', size: '512x512' %>

<%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
<%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Application < Rails::Application
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")

config.assets.paths << Rails.root.join('node_modules/govuk-frontend/govuk/assets')
config.assets.paths << Rails.root.join('node_modules/govuk-frontend/dist/govuk/assets')

config.exceptions_app = routes
end
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "app",
"private": "true",
"dependencies": {
"esbuild": "^0.17.19",
"govuk-frontend": "4.6.0",
"sass": "^1.62.1",
"esbuild": "^0.20.1",
"govuk-frontend": "5.2.0",
"sass": "^1.71.1",
"yarn": "^1.22.21"
},
"scripts": {
Expand All @@ -13,6 +13,6 @@
},
"devDependencies": {
"@prettier/plugin-ruby": "^4.0.1",
"prettier": "^2.8.8"
"prettier": "^3.2.5"
}
}
2 changes: 1 addition & 1 deletion spec/fixtures/vcr_cassettes/geocoder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@ http_interactions:
} ]
}
recorded_at: Thu, 07 Mar 2024 11:38:13 GMT
recorded_with: VCR 6.2.0
recorded_with: VCR 6.2.0
Loading
Loading