Rails default branch name changed from master to main

activerecord-hackery · Jan 17, 2021 · 5a861da · 5a861da
1 parent c616633
commit 5a861da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/cronjob.yml b/.github/workflows/cronjob.yml
@@ -16,7 +16,7 @@ jobs:
           - 2.6.6
     env:
       DB: sqlite3
-      RAILS: master
+      RAILS: main
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
@@ -39,7 +39,7 @@ jobs:
           - 2.6.6
     env:
       DB: mysql
-      RAILS: master
+      RAILS: main
       MYSQL_USERNAME: root
       MYSQL_PASSWORD: root
     steps:
@@ -71,7 +71,7 @@ jobs:
           - 2.6.6
     env:
       DB: postgres
-      RAILS: master
+      RAILS: main
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: postgres
       DATABASE_HOST: 127.0.0.1

diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,7 @@ rails_version = case rails
                 end
 
 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 'pry', '~> 0.12.2'
 gem 'byebug'