Rename master to main.

wata727 · Jan 20, 2021 · 2e78129 · 2e78129
1 parent d0eee5b
commit 2e78129
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,11 +47,11 @@ jobs:
       - run_rspec:
           gemfile: rails-6.1
 
-  ruby_2_5_rails_master:
+  ruby_2_5_rails_main:
     executor: ruby_2_5
     steps:
       - run_rspec:
-          gemfile: rails-master
+          gemfile: rails-main
 
   ruby_2_6_rails_5_2:
     executor: ruby_2_6
@@ -71,11 +71,11 @@ jobs:
       - run_rspec:
           gemfile: rails-6.1
 
-  ruby_2_6_rails_master:
+  ruby_2_6_rails_main:
     executor: ruby_2_6
     steps:
       - run_rspec:
-          gemfile: rails-master
+          gemfile: rails-main
 
   ruby_2_7_rails_5_2:
     executor: ruby_2_7
@@ -95,11 +95,11 @@ jobs:
       - run_rspec:
           gemfile: rails-6.1
 
-  ruby_2_7_rails_master:
+  ruby_2_7_rails_main:
     executor: ruby_2_7
     steps:
       - run_rspec:
-          gemfile: rails-master
+          gemfile: rails-main
 
 workflows:
   version: 2
@@ -109,15 +109,15 @@ workflows:
       - ruby_2_5_rails_5_2
       - ruby_2_5_rails_6_0
       - ruby_2_5_rails_6_1
-      - ruby_2_5_rails_master
+      - ruby_2_5_rails_main
       - ruby_2_6_rails_5_2
       - ruby_2_6_rails_6_0
       - ruby_2_6_rails_6_1
-      - ruby_2_6_rails_master
+      - ruby_2_6_rails_main
       - ruby_2_7_rails_5_2
       - ruby_2_7_rails_6_0
       - ruby_2_7_rails_6_1
-      - ruby_2_7_rails_master
+      - ruby_2_7_rails_main
 
   daily_test:
     triggers:

diff --git a/Appraisals b/Appraisals
@@ -4,7 +4,7 @@ appraise "rails-5.2" do
   gem "rails", "~> 5.2.0"
 end
 
-appraise "rails-master" do
+appraise "rails-main" do
   gem "rails", git: 'https://github.com/rails/rails.git', branch: "main"
 end
 

diff --git a/gemfiles/rails_master.gemfile → gemfiles/rails_main.gemfile b/gemfiles/rails_master.gemfile → gemfiles/rails_main.gemfile