Rails default branch name changed from master to main

This commit is contained in:
Yasuo Honda 2021-01-17 09:01:50 +09:00
parent c6166334ba
commit 5a861daeaa
2 changed files with 4 additions and 4 deletions

View File

@ -16,7 +16,7 @@ jobs:
- 2.6.6 - 2.6.6
env: env:
DB: sqlite3 DB: sqlite3
RAILS: master RAILS: main
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up Ruby - name: Set up Ruby
@ -39,7 +39,7 @@ jobs:
- 2.6.6 - 2.6.6
env: env:
DB: mysql DB: mysql
RAILS: master RAILS: main
MYSQL_USERNAME: root MYSQL_USERNAME: root
MYSQL_PASSWORD: root MYSQL_PASSWORD: root
steps: steps:
@ -71,7 +71,7 @@ jobs:
- 2.6.6 - 2.6.6
env: env:
DB: postgres DB: postgres
RAILS: master RAILS: main
DATABASE_USERNAME: postgres DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres DATABASE_PASSWORD: postgres
DATABASE_HOST: 127.0.0.1 DATABASE_HOST: 127.0.0.1

View File

@ -15,7 +15,7 @@ rails_version = case rails
end end
gem 'faker', '~> 2.0' gem 'faker', '~> 2.0'
gem 'sqlite3', ::Gem::Version.new(rails_version == 'master' ? '6.2.0.alpha' : rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3' gem 'sqlite3', ::Gem::Version.new(rails_version == 'main' ? '6.2.0.alpha' : rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
gem 'pg', '~> 1.0' gem 'pg', '~> 1.0'
gem 'pry', '~> 0.12.2' gem 'pry', '~> 0.12.2'
gem 'byebug' gem 'byebug'