Merge pull request #245 from solidusio/waiting-for-dev/solidus_main

Adapt to new Solidus default branch name

Author: waiting-for-dev

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
     parameters:
       solidus:
         type: string
-        default: master
+        default: main
       db:
         type: string
         default: "postgres"
@@ -43,7 +43,7 @@ workflows:
       - run-specs:
           name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
           matrix:
-            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
       - run-specs:
           name: *name
           matrix:
@@ -54,7 +54,7 @@ workflows:
             parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
       - lint-code
 
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
@@ -66,7 +66,7 @@ workflows:
       - run-specs:
           name: *name
           matrix:
-            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
       - run-specs:
           name: *name
           matrix:

Gemfile

@@ -3,14 +3,14 @@
 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', github: 'solidusio/solidus', branch: branch
 gem 'solidus_backend', github: 'solidusio/solidus', branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2
 if branch >= 'v3.2'
   gem 'solidus_frontend'
-elsif branch == 'master'
+elsif branch == 'main'
   gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
 else
   gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch

bin/sandbox

@@ -32,8 +32,8 @@ if [ -n "$SOLIDUS_BRANCH" ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
-  echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
-  BRANCH="master"
+  echo "~~> Use 'export SOLIDUS_BRANCH=[main|v3.2|...]' to control the Solidus branch"
+  BRANCH="main"
 fi
 echo "~~> Using branch $BRANCH of solidus"