Skip to content

Commit

Permalink
Merge pull request #76 from solidusio/waiting-for-dev/solidus_main
Browse files Browse the repository at this point in the history
Adapt to new Solidus default branch
  • Loading branch information
waiting-for-dev authored May 22, 2023
2 parents 8d79a68 + 1f881e2 commit 3781288
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
parameters:
solidus:
type: string
default: master
default: main
db:
type: string
default: "postgres"
Expand All @@ -32,7 +32,7 @@ workflows:
- run-specs:
name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
matrix:
parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
- run-specs:
name: *name
matrix:
Expand All @@ -42,19 +42,19 @@ workflows:
matrix:
parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }

"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:
name: *name
matrix:
parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
- run-specs:
name: *name
matrix:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
gem 'solidus_core', github: 'solidusio/solidus', branch: branch

case ENV['DB']
Expand Down

0 comments on commit 3781288

Please sign in to comment.