Skip to content

Commit 5a861da

Browse files
committed
Rails default branch name changed from master to main
1 parent c616633 commit 5a861da

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/cronjob.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- 2.6.6
1717
env:
1818
DB: sqlite3
19-
RAILS: master
19+
RAILS: main
2020
steps:
2121
- uses: actions/checkout@v2
2222
- name: Set up Ruby
@@ -39,7 +39,7 @@ jobs:
3939
- 2.6.6
4040
env:
4141
DB: mysql
42-
RAILS: master
42+
RAILS: main
4343
MYSQL_USERNAME: root
4444
MYSQL_PASSWORD: root
4545
steps:
@@ -71,7 +71,7 @@ jobs:
7171
- 2.6.6
7272
env:
7373
DB: postgres
74-
RAILS: master
74+
RAILS: main
7575
DATABASE_USERNAME: postgres
7676
DATABASE_PASSWORD: postgres
7777
DATABASE_HOST: 127.0.0.1

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rails_version = case rails
1515
end
1616

1717
gem 'faker', '~> 2.0'
18-
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'
18+
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'
1919
gem 'pg', '~> 1.0'
2020
gem 'pry', '~> 0.12.2'
2121
gem 'byebug'

0 commit comments

Comments
 (0)