Use Main In Place of Master

Master has been deprecated in favor of main solidusio/solidus#5042
cpfergus1 · May 12, 2023 · 38d844b · 38d844b
1 parent e7a1807
commit 38d844b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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,14 +3,14 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
+solidus_git, solidus_frontend_git = if (branch == 'main') || (branch >= 'v3.2')
  %w[solidusio/solidus solidusio/solidus_frontend]
  else
  %w[solidusio/solidus] * 2
  end
 gem 'solidus', github: solidus_git, branch: branch
-gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
+gem 'solidus_frontend', github: solidus_frontend_git, branch: 'v3.4'
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.

diff --git a/bin/sandbox b/bin/sandbox
@@ -22,7 +22,7 @@ if [ ! -z $SOLIDUS_BRANCH ]
 then
  BRANCH=$SOLIDUS_BRANCH
 else
- BRANCH="master"
+ BRANCH="main"
 fi
 
 extension_name="solidus_jwt"