Skip to content

Commit b9e9bd1

Browse files
Update orb to use new main Solidus default branch
Ref solidusio/solidus#5042
1 parent 624477d commit b9e9bd1

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

.circleci/test-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
ruby_version: "3.2"
3333
steps:
3434
- checkout
35-
- extensions/run-tests-solidus-master:
35+
- extensions/run-tests-solidus-main:
3636
working_directory: '~/project/solidus_dummy_extension'
3737
- extensions/store-test-results
3838
test-run-linting-code:

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ workflows:
5454
- run-specs-with-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-with-sqlite
6767
```

solidus_dummy_extension/Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
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
10-
gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master'
10+
gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'main'
1111
gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
1212

1313
gem 'rails', ENV.fetch('RAILS_VERSION', nil)

solidus_dummy_extension/bin/sandbox

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ if [ -n $SOLIDUS_BRANCH ]
3232
then
3333
BRANCH=$SOLIDUS_BRANCH
3434
else
35-
echo "~~> Use 'export SOLIDUS_BRANCH=[master|v4.0|...]' to control the Solidus branch"
36-
BRANCH="master"
35+
echo "~~> Use 'export SOLIDUS_BRANCH=[main|v4.0|...]' to control the Solidus branch"
36+
BRANCH="main"
3737
fi
3838
echo "~~> Using branch $BRANCH of solidus"
3939

src/commands/run-tests-solidus-master.yml src/commands/run-tests-solidus-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88

99
steps:
1010
- test-branch:
11-
branch: master
11+
branch: main
1212
rails_version: '~> 7.0'
1313
working_directory: <<parameters.working_directory>>
1414

src/commands/run-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ steps:
66
- dependencies
77
- run-tests-solidus-older
88
- run-tests-solidus-current
9-
- run-tests-solidus-master
9+
- run-tests-solidus-main
1010
- store-test-results

src/commands/test-branch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description:
44
parameters:
55
branch:
66
type: string
7-
default: master
7+
default: main
88
command:
99
type: string
1010
default: bundle exec rake

src/examples/extension.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ usage:
4646
- run-specs-with-postgres
4747
- run-specs-with-mysql
4848
- run-specs-with-sqlite
49-
"Weekly run specs against master":
49+
"Weekly run specs against main":
5050
triggers:
5151
- schedule:
5252
cron: "0 0 * * 4" # every Thursday
5353
filters:
5454
branches:
5555
only:
56-
- master
56+
- main
5757
jobs:
5858
- run-specs-with-sqlite

0 commit comments

Comments
 (0)