Adapt to new Solidus default branch

Ref. solidusio/solidus#5042
solidusio · Apr 24, 2023 · 8303615 · 8303615
1 parent 08e840b
commit 8303615
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,14 +22,14 @@ workflows:
     jobs:
       - run-specs-with-postgres
       - run-specs-with-mysql
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - run-specs-with-postgres
       - run-specs-with-mysql
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus_core', github: 'solidusio/solidus', branch: branch
 
 case ENV['DB']