Adapt to new Solidus default branch name

Ref. solidusio/solidus#5042
solidusio · Apr 24, 2023 · 89472c5 · 89472c5
1 parent e3632ae
commit 89472c5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -72,7 +72,7 @@ jobs:
     parameters:
       solidus_branch:
         type: string
-        default: 'master'
+        default: 'main'
       rails_version:
         type: string
         default: '~> 7.0'

diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ Eg. Solidus v3.3 tests against Rails 7.0
 
 ### Solidus Version
 
-- `main` branch will test installing itself over Solidus master only.
+- `main` branch will test installing itself over Solidus main only.
 - the branch corresponding to the latest Solidus release (with `vX.X`
   format) will only test installing itself over the corresponding
   Solidus version.

diff --git a/bin/sandbox b/bin/sandbox
@@ -52,7 +52,7 @@ test -n "${password}" && replace_in_database_yml "password" "${password}"
 
 unbundled bundle add solidus \
   --github "${SOLIDUS_REPO:-solidusio/solidus}" \
-  --branch "${SOLIDUS_BRANCH:-master}" \
+  --branch "${SOLIDUS_BRANCH:-main}" \
   --version '> 0.a'
 
 unbundled bundle exec rake db:drop db:create

diff --git a/templates/app/assets/javascripts/solidus_starter_frontend.js b/templates/app/assets/javascripts/solidus_starter_frontend.js
@@ -4,7 +4,7 @@
 // spree/frontend/all points to the
 // `vendor/assets/javascripts/spree/frontend/all.js` file generated by
 // `solidus:install`. See `setup_assets` at
-// https://github.com/solidusio/solidus/blob/master/core/lib/generators/solidus/install/install_generator.rb
+// https://github.com/solidusio/solidus/blob/main/core/lib/generators/solidus/install/install_generator.rb
 //= require spree/frontend/all
 
 //= require utils

diff --git a/templates/app/assets/stylesheets/solidus_starter_frontend.css b/templates/app/assets/stylesheets/solidus_starter_frontend.css
@@ -6,7 +6,7 @@
  * spree/frontend/all points to the
  * `vendor/assets/stylesheets/spree/frontend/all.css` file generated by
  * `solidus:install`. See `setup_assets` at
- * https://github.com/solidusio/solidus/blob/master/core/lib/generators/solidus/install/install_generator.rb
+ * https://github.com/solidusio/solidus/blob/main/core/lib/generators/solidus/install/install_generator.rb
  *= require spree/frontend/all
  *
  *= require screen