Merge branch 'develop' into 891-dev-update-rails-7.2

.github/workflows/cd.yml

@@ -0,0 +1,56 @@
+name: CD
+
+on:
+  workflow_run:
+    workflows:
+      - Rspec
+    types:
+      - compleed
+
+  pull_request:
+    branches:
+      - develop
+      - master
+    types:
+      - closed
+
+  release:
+    types:
+      - published
+
+jobs:
+  deploy-to-staging:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.5
+          bundler-cache: true
+
+      - uses: miloserdow/capistrano-deploy@v3
+        with:
+          target: staging
+          deploy_key: ${{ secrets.STAGING_KEY_PASSWORD }}
+          enc_rsa_key_pth: config/credentials/staging_deploy_id_ed25519_enc
+
+  deploy-to-production:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.5
+          bundler-cache: true
+
+      - uses: miloserdow/capistrano-deploy@v3
+        with:
+          target: production
+          deploy_key: ${{ secrets.PRODUCTION_KEY_PASSWORD }}
+          enc_rsa_key_pth: config/credentials/production_deploy_id_ed25519_enc

.github/workflows/ci.yml

@@ -3,14 +3,24 @@ name: CI
 on:
   push:
 
+  pull_request:
+    branches:
+      - develop
+      - master
+    types:
+      - closed
+
+  release:
+    types: [published]
+
 jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.3
+          ruby-version: 3.3.5
           bundler-cache: true
           cache-version: 1
       - name: Run rubocop
@@ -49,13 +59,19 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.3
+          ruby-version: 3.3.5
           bundler-cache: true
 
+      - name: Update packages
+        run: sudo apt-get update
+
+      - name: Install system dependencies
+        run: sudo apt-get install -y libvips42 libvips-dev imagemagick
+
       - uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "14.x"
+          registry-url: "https://registry.npmjs.org"
 
       - uses: nanasess/setup-chromedriver@master
 

.rubocop.yml

@@ -20,7 +20,7 @@ inherit_gem:
 AllCops:
   SuggestExtensions: true
   NewCops: enable
-  TargetRubyVersion: 3.0.6
+  TargetRubyVersion: 3.2
 
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: true

.rubocop/rspec.yml

@@ -1,5 +1,7 @@
 require:
   - rubocop-rspec
+  - rubocop-factory_bot
+  - rubocop-capybara
 
 # Disable all cops by default,
 # only enable those defined explcitly in this configuration file

.ruby-version

@@ -1 +1 @@
-ruby-3.2.3
+ruby-3.3.5

Capfile

@@ -11,6 +11,5 @@ require "capistrano/passenger"
 require "capistrano/rails_tail_log"
 require "capistrano/rails"
 require "capistrano/rvm"
-# require "capistrano/rbenv"
 
 Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.3
+FROM ruby:3.3.5
 
 ENV BUNDLER_VERSION=2.2.8
 

Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.3"
+ruby "3.3.5"
 
 gem "mutex_m", "0.1.2"
 gem "cancancan", "~> 3.3"
@@ -60,6 +60,8 @@ group :development, :test, :ci do
   gem "rubocop-rspec", require: false
   gem "rubocop-performance", require: false
   gem "rubocop-rails", require: false
+  gem "rubocop-factory_bot", require: false
+  gem "rubocop-capybara", require: false
   gem "standard", "~> 1.0", require: false
   gem "rubocop-factory_bot"
   gem "rubocop-capybara"

Gemfile.lock

@@ -99,6 +99,8 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
     bigdecimal (3.0.2)
     bindex (0.8.1)
     bootsnap (1.18.4)
@@ -197,7 +199,16 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
     flipper (1.3.1)
       concurrent-ruby (< 2)
     flipper-active_record (1.3.1)
@@ -301,15 +312,25 @@ GEM
       net-protocol
     net-ssh (7.3.0)
     nio4r (2.7.4)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
-    oauth2 (1.4.11)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
+      racc (~> 1.4)
+    oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -318,8 +339,7 @@ GEM
       omniauth-oauth2 (>= 1.2, < 3)
     omniauth-google-oauth2 (0.8.2)
       jwt (>= 2.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.1)
+      omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.6)
     omniauth-oauth2 (1.7.3)
       oauth2 (>= 1.4, < 3)
@@ -478,8 +498,6 @@ GEM
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sassc (2.4.0-x64-mingw32)
-      ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
@@ -501,7 +519,7 @@ GEM
     simple_form (5.3.1)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -514,6 +532,9 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       slim (>= 3.0, < 6.0, != 5.0.0)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     spring (4.2.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
@@ -545,9 +566,11 @@ GEM
     stringio (3.1.1)
     tailwindcss-rails (2.7.9)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.7.9-arm64-darwin)
+    tailwindcss-rails (2.7.9-aarch64-linux)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.7.9-x64-mingw32)
+    tailwindcss-rails (2.7.9-arm-linux)
+      railties (>= 7.0.0)
+    tailwindcss-rails (2.7.9-arm64-darwin)
       railties (>= 7.0.0)
     tailwindcss-rails (2.7.9-x86_64-darwin)
       railties (>= 7.0.0)
@@ -570,6 +593,7 @@ GEM
     unicode-display_width (2.6.0)
     uri (0.13.1)
     useragent (0.16.10)
+    version_gem (1.1.4)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)
@@ -591,11 +615,20 @@ GEM
     zeitwerk (2.7.1)
 
 PLATFORMS
-  arm64-darwin-21
-  ruby
-  x64-mingw32
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
   x86_64-darwin
   x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   active_model_serializers (~> 0.10.0)
@@ -683,7 +716,7 @@ DEPENDENCIES
   webdrivers (~> 5.3.1)
 
 RUBY VERSION
-   ruby 3.2.3p157
+   ruby 3.3.5p100
 
 BUNDLED WITH
-   2.4.18
+   2.5.11