Merge pull request #3437 from OfficeForProductSafetyAndStandards/chor…

…e/update_rails_gem chore/update_rails_gem
OfficeForProductSafetyAndStandards · Oct 16, 2024 · e195997 · e195997
2 parents c0794ed + 942581d
commit e195997
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/erd.yml b/.github/workflows/erd.yml
@@ -54,7 +54,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2.1
+        ruby-version: 3.2.2
 
     - name: Set up Node
       uses: actions/setup-node@v4

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2.1
+        ruby-version: 3.2.2
     - uses: actions/cache@v4
       with:
         path: cosmetics-web/vendor/bundle

diff --git a/.github/workflows/smoke_test.yml b/.github/workflows/smoke_test.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2.1
+        ruby-version: 3.2.2
     - name: Set up Node
       uses: actions/setup-node@v4
       with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2.1
+        ruby-version: 3.2.2
     - name: Set up Node
       uses: actions/setup-node@v4
       with:

diff --git a/cosmetics-web/.ruby-version b/cosmetics-web/.ruby-version
@@ -1 +1 @@
-3.2.1
+3.2.2
diff --git a/cosmetics-web/Dockerfile b/cosmetics-web/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.1
+FROM ruby:3.2.2
 
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/cosmetics-web/Gemfile b/cosmetics-web/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "~> 3.2.1"
+ruby "~> 3.2.2"
 
 gem "kaminari" # Must be loaded before ElasticSearch gems
 

diff --git a/cosmetics-web/Gemfile.lock b/cosmetics-web/Gemfile.lock
@@ -635,6 +635,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-darwin-21
   x86_64-darwin-22
   x86_64-linux
@@ -723,7 +724,7 @@ DEPENDENCIES
   wicked (~> 2.0)
 
 RUBY VERSION
-   ruby 3.2.1p31
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.4.4
diff --git a/cosmetics-web/support_portal/Gemfile b/cosmetics-web/support_portal/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.1"
+ruby "3.2.2"
 
 # Specify your gem's dependencies in support_portal.gemspec.
 gemspec

diff --git a/cosmetics-web/support_portal/Gemfile.lock b/cosmetics-web/support_portal/Gemfile.lock
@@ -236,14 +236,15 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
   sprockets-rails
   support_portal!
 
 RUBY VERSION
-   ruby 3.2.1p31
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.4.4
diff --git a/cosmetics-web/support_portal/support_portal.gemspec b/cosmetics-web/support_portal/support_portal.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   end
 
   # This should be kept in sync with the Ruby version used by the main app
-  spec.required_ruby_version = ">= 3.2.0"
+  spec.required_ruby_version = ">= 3.2.2"
 
   # Ensure any gems that are also used in the main app have the same version constraints
   # Run `bundle install` for both this engine and the main app when adding or changing gems