Release 2025-12-17 07:31:32 +0000

.circleci/config.yml

@@ -1,36 +1,26 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@2.5.0
-  node: circleci/node@7.1.0
-  browser-tools: circleci/browser-tools@1.5.2
+  ruby: circleci/ruby@2.5.4
+  node: circleci/node@7.1.1
+  browser-tools: circleci/browser-tools@2.3.2
 jobs:
   build:
     docker:
-      - image: cimg/ruby:3.1.6-node
+      - image: cimg/ruby:3.4.3-node
     steps:
       - checkout
-      - run:
-          name: Configure Bundler
-          command: |
-            bundle config set --local force_ruby_platform true
-            bundle lock --add-platform ruby
       - ruby/install-deps
       - node/install:
           install-yarn: true
-          node-version: '20.9.0'
+          node-version: '22.19.0'
       - node/install-packages:
           pkg-manager: yarn
   check:
     docker:
-      - image: 'cimg/ruby:3.1.6-node'
+      - image: 'cimg/ruby:3.4.3-node'
     steps:
       - checkout
-      - run:
-          name: Configure Bundler
-          command: |
-            bundle config set --local force_ruby_platform true
-            bundle lock --add-platform ruby
       - ruby/install-deps
       - ruby/rubocop-check:
           format: progress
@@ -49,38 +39,34 @@ jobs:
           command: FAIL_ON_ERROR=1 bundle exec rake traceroute
       - node/install:
           install-yarn: true
-          node-version: '20.9.0'
+          node-version: '22.19.0'
       - node/install-packages:
           pkg-manager: yarn
       - run:
           name: Lint
           command: bin/yarn lint
   test:
     docker:
-      - image: cimg/ruby:3.1.6-browsers
+      - image: cimg/ruby:3.4.3-browsers
         environment:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: ci_test
       - image: cimg/postgres:14.4
     resource_class: large
     environment:
-      BUNDLE_JOBS: "3"
-      BUNDLE_RETRY: "3"
+      BUNDLE_JOBS: '3'
+      BUNDLE_RETRY: '3'
       PGHOST: 127.0.0.1
       PGUSER: postgres
-      PGPASSWORD: "postgres"
+      PGPASSWORD: 'postgres'
       RAILS_ENV: test
-      DATABASE_URL: "postgres://postgres:postgres@localhost/ci_test"
+      DATABASE_URL: 'postgres://postgres:postgres@localhost/ci_test'
       TZ: Asia/Tokyo
-      PARALLEL_WORKERS: 2
-    parallelism: 3
+    parallelism: 8
     steps:
       - checkout
-      - browser-tools/install-chrome:
-          replace-existing: true
-          chrome-version: 130.0.6723.116
-      - browser-tools/install-chromedriver
+      - browser-tools/install_browser_tools
       - run:
           command: |
             google-chrome --version
@@ -95,7 +81,7 @@ jobs:
           clean-bundle: true
       - node/install:
           install-yarn: true
-          node-version: '20.9.0'
+          node-version: '22.19.0'
       - node/install-packages:
           pkg-manager: yarn
       - run:
@@ -112,14 +98,11 @@ jobs:
           command: 'bundle exec rails db:setup'
       - run:
           name: Assets precompile
-          command: 'bundle exec rails assets:clean assets:precompile NODE_OPTIONS=--openssl-legacy-provider'
+          command: 'bundle exec rails assets:clean assets:precompile'
       - run:
           name: Test
           command: |
-            TEST_FILES=$(circleci tests glob "test/**/*_test.rb")
-            echo "$TEST_FILES" | circleci tests run --command="xargs bundle exec rails test $TESTFILES" --verbose --split-by=timings
-          no_output_timeout: 30m
-          when: always
+            circleci tests glob "test/**/*_test.rb" | circleci tests run --command="xargs bundle exec rails test" --verbose --split-by=timings --timings-type=filename
       - store_test_results:
           path: test/reports
       - store_artifacts:
@@ -132,5 +115,3 @@ workflows:
       - test:
           requires:
             - build
-
-# VS Code Extension Version: 1.5.1

.cloudbuild/cloudbuild-staging.yaml

@@ -23,33 +23,58 @@ steps:
       - 'asia.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'
     waitFor:
       - Build
+  # Cloud Runサービスを削除してDB接続を切断
+  # Cloud SQLでは管理者権限がないためpg_terminate_backendが使えない
+  # サービスを削除することで接続を確実に切断し、Deployで再作成される
+  - id: StopCloudRun
+    name: gcr.io/google.com/cloudsdktool/cloud-sdk
+    entrypoint: bash
+    args:
+      - '-c'
+      - |
+        set -euo pipefail
+        echo "Deleting Cloud Run service to disconnect database connections..."
+
+        # サービスが存在するか確認して削除
+        if gcloud run services describe $_SERVICE_NAME --region=asia-northeast1 --quiet 2>/dev/null; then
+          gcloud run services delete $_SERVICE_NAME \
+            --region=asia-northeast1 \
+            --quiet
+
+          echo "Cloud Run service deleted. Waiting 10 seconds for connections to close..."
+          sleep 10
+        else
+          echo "Cloud Run service does not exist yet. Skipping delete."
+        fi
+    waitFor:
+      - Push
   - id: SqlProxy
     name: 'gcr.io/cloudsql-docker/gce-proxy:1.16'
     args:
       - /cloud_sql_proxy
       - '-dir=/cloudsql'
       - '-instances=$_CLOUD_SQL_HOST'
     waitFor:
-      - '-'
+      - StopCloudRun
     volumes:
       - name: db
         path: /cloudsql
-  # 既存の接続を強制的に切断
-  - name: 'asia.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'
+  # Cloud SQL Proxyの起動を待つ
+  - id: WaitForProxy
+    name: 'asia.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'
     args:
       - bash
       - '-c'
       - |
         set -euo pipefail
-
-        # Cloud SQL Proxyの起動を待つ（最大60秒）
+
         echo "Waiting for Cloud SQL Proxy to be ready..."
         TIMEOUT=60
         ELAPSED=0
-        
+
         while [ $$ELAPSED -lt $$TIMEOUT ]; do
           echo "Attempting database connection... ($$ELAPSED/$$TIMEOUT seconds)"
-          if cat <<'TESTEOF' | bin/rails runner - 2>/dev/null
+          OUTPUT=$$(cat <<'TESTEOF' | bin/rails runner - 2>&1
         begin
           ActiveRecord::Base.connection.execute("SELECT 1")
           puts "Database connection successful"
@@ -59,36 +84,24 @@ steps:
           exit 1
         end
         TESTEOF
-          then
-            echo "Database connection verified, proceeding to terminate connections..."
-            break
+          )
+          EXITCODE=$$?
+          if [ $$EXITCODE -eq 0 ]; then
+            echo "$$OUTPUT"
+            echo "Cloud SQL Proxy is ready."
+            exit 0
           else
+            echo "Rails runner output: $$OUTPUT"
             echo "Database not ready yet, waiting..."
           fi
           sleep 2
           ELAPSED=$$(($$ELAPSED + 2))
         done
-
-        if [ $$ELAPSED -ge $$TIMEOUT ]; then
-          echo "ERROR: Timeout waiting for Cloud SQL Proxy to be ready after $$TIMEOUT seconds"
-          exit 1
-        fi
-
-        # 接続を強制切断
-        echo "Terminating existing connections to bootcamp_staging database..."
-        cat <<'EOF' | bin/rails runner -
-        result = ActiveRecord::Base.connection.execute("
-          SELECT pg_terminate_backend(pid)
-          FROM pg_stat_activity
-          WHERE datname = 'bootcamp_staging'
-            AND pid <> pg_backend_pid()
-        ")
-        terminated_count = result.ntuples
-        puts "Terminated #{terminated_count} connection(s) to bootcamp_staging database"
-        EOF
-    id: TerminateConnections
+
+        echo "ERROR: Timeout waiting for Cloud SQL Proxy after $$TIMEOUT seconds"
+        exit 1
     waitFor:
-      - Push
+      - StopCloudRun
     volumes:
       - name: db
         path: /cloudsql
@@ -100,19 +113,37 @@ steps:
       - DB_PASS=$_DB_PASS
       - DB_USER=$_DB_USER
       - RAILS_MASTER_KEY=$_RAILS_MASTER_KEY
-  # データベースを削除
+      - APP_HOST_NAME=$_APP_HOST_NAME
+  # データベースを削除（リトライ付き）
+  # WaitForProxyの接続がCloud SQL Proxy経由で残っている場合があるため、
+  # 接続が切れるまでリトライする
   - name: gcr.io/google.com/cloudsdktool/cloud-sdk
-    args:
-      - sql
-      - databases
-      - delete
-      - bootcamp_staging
-      - '--instance=bootcamp'
-      - '--quiet'
     id: DeleteDB
+    entrypoint: bash
+    args:
+      - '-c'
+      - |
+        set -euo pipefail
+        MAX_RETRIES=5
+        RETRY_DELAY=5
+
+        for i in $$(seq 1 $$MAX_RETRIES); do
+          echo "Attempt $$i/$$MAX_RETRIES: Deleting database bootcamp_staging..."
+          if gcloud sql databases delete bootcamp_staging --instance=bootcamp --quiet 2>&1; then
+            echo "Database deleted successfully."
+            exit 0
+          else
+            if [ $$i -lt $$MAX_RETRIES ]; then
+              echo "Database delete failed (likely still has connections). Waiting $$RETRY_DELAY seconds before retry..."
+              sleep $$RETRY_DELAY
+            fi
+          fi
+        done
+
+        echo "ERROR: Failed to delete database after $$MAX_RETRIES attempts."
+        exit 1
     waitFor:
-      - TerminateConnections
-    entrypoint: gcloud
+      - WaitForProxy
     volumes:
       - name: db
         path: /cloudsql
@@ -150,6 +181,7 @@ steps:
       - DB_PASS=$_DB_PASS
       - DB_USER=$_DB_USER
       - RAILS_MASTER_KEY=$_RAILS_MASTER_KEY
+      - APP_HOST_NAME=$_APP_HOST_NAME
   - id: Kill_SqlProxy
     name: gcr.io/cloud-builders/docker
     entrypoint: sh

.devcontainer/Dockerfile

@@ -5,7 +5,7 @@ ARG VARIANT=3.1-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="lts/*"
+ARG NODE_VERSION="22.19.0"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
 # Install OS packages

.eslintrc.json

@@ -19,7 +19,7 @@
   },
   "root": true,
   "parserOptions": {
-    "ecmaVersion": 2020
+    "ecmaVersion": 2022
   },
   "rules": {
     "no-unused-vars": [

.gitignore

@@ -39,3 +39,10 @@ storage/
 .envrc
 .env.local
 /test/reports
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

.mise.toml

@@ -1,3 +1,3 @@
 [tools]
-ruby = "3.1.6"
-node = "20.9.0"
+ruby = "3.4.3"
+node = "22.19.0"

.node-version

@@ -1 +1 @@
-20.9.0
+22.19.0

.nvmrc

@@ -1 +1 @@
-20.9.0
+22.19.0

.rubocop.yml

@@ -1,6 +1,8 @@
 require:
   - rubocop-minitest
   - rubocop-capybara
+  - rubocop-performance
+  - rubocop-rails
 
 inherit_gem:
   rubocop-fjord:
@@ -19,6 +21,8 @@ AllCops:
     - config/**/*
     - config.ru
     - node_modules/**/*
+    - db/data/*
+    - db/data_schema.rb
     - db/migrate/*
     - db/schema.rb
     - storage/**/*

.ruby-version

@@ -1 +1 @@
-3.1.6
+3.4.3

.tool-versions

@@ -1,2 +1,2 @@
-ruby 3.1.6
-nodejs 20.9.0
+ruby 3.4.3
+nodejs 22.19.0