Skip to content

Commit

Permalink
Merge pull request #3985 from Crown-Commercial-Service/release-5.1.2
Browse files Browse the repository at this point in the history
PRODUCTION - Release 5.1.2
  • Loading branch information
tim-s-ccs authored Oct 12, 2023
2 parents 8f6e9b3 + 3be176c commit a428673
Show file tree
Hide file tree
Showing 114 changed files with 1,098 additions and 1,014 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy_to_aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
name: ${{ inputs.environment }}
steps:
- name: Trigger AWS CodePipeline - main container
uses: Crown-Commercial-Service/ccs-aws-codepipeline-action@v1.0.10
uses: Crown-Commercial-Service/ccs-aws-codepipeline-action@v1.1.0
with:
aws-region: ${{ secrets.AWS_PIPELINE_REGION }}
aws-access-key: ${{ secrets.AWS_PIPELINE_ACCESS_KEY }}
Expand All @@ -59,7 +59,7 @@ jobs:
name: ${{ inputs.environment }}
steps:
- name: Trigger AWS CodePipeline - sidekiq container
uses: Crown-Commercial-Service/ccs-aws-codepipeline-action@v1.0.10
uses: Crown-Commercial-Service/ccs-aws-codepipeline-action@v1.1.0
with:
aws-region: ${{ secrets.AWS_PIPELINE_REGION }}
aws-access-key: ${{ secrets.AWS_PIPELINE_ACCESS_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/feature_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
uses: browser-actions/setup-geckodriver@latest

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

- name: Install Ruby and gems
uses: ruby/setup-ruby@v1.152.0
uses: ruby/setup-ruby@v1.155.0
with:
bundler-cache: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:

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

- name: Install Ruby and gems
uses: ruby/setup-ruby@v1.152.0
uses: ruby/setup-ruby@v1.155.0
with:
bundler-cache: true

Expand Down
6 changes: 6 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,9 @@ Rails/ThreeStateBooleanColumn:

RSpec/IndexedLet:
Enabled: false

FactoryBot/FactoryAssociationWithStrategy:
Enabled: false

Capybara/ClickLinkOrButtonStyle:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.2.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.1-alpine
FROM ruby:3.2.2-alpine

# Build information
ARG GIT_OWNER
Expand Down
18 changes: 9 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.2.1'
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.6'
gem 'rails', '~> 7.0.8'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 6.3'
gem 'puma', '~> 6.4'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.1', '>= 5.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

gem 'sprockets-rails'

gem 'shakapacker', '~> 7.0.2'
gem 'shakapacker', '~> 7.1.0'

gem 'turbolinks', '~> 5'

Expand Down Expand Up @@ -55,7 +55,7 @@ gem 'devise', '~> 4.9.2'
gem 'auto-session-timeout', '~> 1.0'

# for cognito
gem 'aws-sdk-cognitoidentityprovider', '~> 1.79.0'
gem 'aws-sdk-cognitoidentityprovider', '~> 1.82.0'

# for pagination
gem 'kaminari', '~> 1.2.2'
Expand All @@ -71,8 +71,8 @@ gem 'aasm', '~> 5.5'
gem 'after_commit_everywhere', '~> 1.3'

# for running background jobs
gem 'sidekiq', '~> 7.1.2'
gem 'sinatra', '~> 3.0.6', require: false
gem 'sidekiq', '~> 7.1.5'
gem 'sinatra', '~> 3.1.0', require: false
gem 'slim', '~> 5.1.1'
gem 'sidekiq-cron'

Expand All @@ -95,7 +95,7 @@ gem 'ratonvirus-clamby', '>= 0.3.0'
# for active storage validation
gem 'active_storage_validations', '>= 1.0.3'
# gem for bulk inserts
gem 'activerecord-import', '~> 1.4.1'
gem 'activerecord-import', '~> 1.5.0'
# gov notify
gem 'notifications-ruby-client'
# DOCX generation
Expand Down Expand Up @@ -130,7 +130,7 @@ group :development, :test do
gem 'wdm', '>= 0.1.0', platforms: %i[x64_mingw]
gem 'tzinfo-data', platforms: %i[x64_mingw]
gem 'bullet', require: true
gem 'faker', '~> 3.2.0'
gem 'faker', '~> 3.2.1'
end

group :development do
Expand Down
Loading

0 comments on commit a428673

Please sign in to comment.