File tree 3 files changed +8
-8
lines changed
3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 15
15
parameters :
16
16
solidus :
17
17
type : string
18
- default : master
18
+ default : main
19
19
db :
20
20
type : string
21
21
default : " postgres"
@@ -43,7 +43,7 @@ workflows:
43
43
- run-specs :
44
44
name : &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
45
45
matrix :
46
- parameters : { solidus: ["master "], ruby: ["3.2"], db: ["postgres"] }
46
+ parameters : { solidus: ["main "], ruby: ["3.2"], db: ["postgres"] }
47
47
- run-specs :
48
48
name : *name
49
49
matrix :
@@ -54,19 +54,19 @@ workflows:
54
54
parameters : { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
55
55
- lint-code
56
56
57
- " Weekly run specs against master " :
57
+ " Weekly run specs against main " :
58
58
triggers :
59
59
- schedule :
60
60
cron : " 0 0 * * 4" # every Thursday
61
61
filters :
62
62
branches :
63
63
only :
64
- - master
64
+ - main
65
65
jobs :
66
66
- run-specs :
67
67
name : *name
68
68
matrix :
69
- parameters : { solidus: ["master "], ruby: ["3.2"], db: ["postgres"] }
69
+ parameters : { solidus: ["main "], ruby: ["3.2"], db: ["postgres"] }
70
70
- run-specs :
71
71
name : *name
72
72
matrix :
Original file line number Diff line number Diff line change 3
3
source 'https://rubygems.org'
4
4
git_source ( :github ) { |repo | "https://github.com/#{ repo } .git" }
5
5
6
- branch = ENV . fetch ( 'SOLIDUS_BRANCH' , 'master ' )
6
+ branch = ENV . fetch ( 'SOLIDUS_BRANCH' , 'main ' )
7
7
gem 'solidus' , github : 'solidusio/solidus' , branch : branch
8
8
9
9
# The solidus_frontend gem has been pulled out since v3.2
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ test "$DB" = "sqlite" && export DB="sqlite3"
7
7
8
8
if [ -z " $SOLIDUS_BRANCH " ]
9
9
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 "
12
12
fi
13
13
echo " ~~> Using branch $SOLIDUS_BRANCH of solidus"
14
14
You can’t perform that action at this time.
0 commit comments