Skip to content

Commit d6fd5f3

Browse files
committed
Solidus 4.0 Master Branch Changed to Main
solidusio/solidus#5042
1 parent d2dd300 commit d6fd5f3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
parameters:
1616
solidus:
1717
type: string
18-
default: master
18+
default: main
1919
db:
2020
type: string
2121
default: "postgres"
@@ -43,7 +43,7 @@ workflows:
4343
- run-specs:
4444
name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
4545
matrix:
46-
parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
46+
parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
4747
- run-specs:
4848
name: *name
4949
matrix:
@@ -54,19 +54,19 @@ workflows:
5454
parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
5555
- lint-code
5656

57-
"Weekly run specs against master":
57+
"Weekly run specs against main":
5858
triggers:
5959
- schedule:
6060
cron: "0 0 * * 4" # every Thursday
6161
filters:
6262
branches:
6363
only:
64-
- master
64+
- main
6565
jobs:
6666
- run-specs:
6767
name: *name
6868
matrix:
69-
parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
69+
parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
7070
- run-specs:
7171
name: *name
7272
matrix:

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
6+
branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
77
gem 'solidus', github: 'solidusio/solidus', branch: branch
88

99
# The solidus_frontend gem has been pulled out since v3.2

bin/sandbox

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ test "$DB" = "sqlite" && export DB="sqlite3"
77

88
if [ -z "$SOLIDUS_BRANCH" ]
99
then
10-
echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
11-
SOLIDUS_BRANCH="master"
10+
echo "~~> Use 'export SOLIDUS_BRANCH=[main|v3.2|...]' to control the Solidus branch"
11+
SOLIDUS_BRANCH="main"
1212
fi
1313
echo "~~> Using branch $SOLIDUS_BRANCH of solidus"
1414

0 commit comments

Comments
 (0)