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.

Sign up for GitHub

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

Feature/ci(#26) #27

Merged
merged 4 commits into from
Dec 15, 2024
Merged

Feature/ci(#26) #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b91d96d
Update mysql2 gem to ~> 0.5.6 to fix collation issue
yu-yaba Dec 15, 2024
9bc0ac1
mysqバージョンを変更
yu-yaba Dec 15, 2024
c7a8ff7
Update to use utf8mb4_unicode_ci collation
yu-yaba Dec 15, 2024
54fbccc
rubocop -Aを実行
yu-yaba Dec 15, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/rubyonrails.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:5.7
image: mysql:8.0.33
ports:
- "3306:3306"
env:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem 'puma', '~> 5.0'

gem 'httparty'

gem 'dotenv-rails', groups: [:development, :test]
gem 'dotenv-rails', groups: %i[development test]

gem 'recaptcha', require: 'recaptcha/rails'
# Use Redis adapter to run Action Cable in production
Expand Down Expand Up @@ -47,7 +47,7 @@ gem 'kaminari'

gem 'pry-rails'

gem 'mysql2', '~> 0.5'
gem 'mysql2', '~> 0.5.6'

group :development do
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
Expand All @@ -73,4 +73,4 @@ end

# group :production do
# gem 'pg', '~> 1.2', '>= 1.2.3'
# end
# end
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ DEPENDENCIES
faker
httparty
kaminari
mysql2 (~> 0.5)
mysql2 (~> 0.5.6)
pry-rails
puma (~> 5.0)
rack-cors
Expand Down
1 change: 1 addition & 0 deletions config/database.yml.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
test:
adapter: mysql2
encoding: utf8mb4
collation: utf8mb4_general_ci
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
username: root
password:
Expand Down
Loading