Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to new Solidus default branch #76

Merged
merged 1 commit into from
May 22, 2023
+6 −6
Merged

Adapt to new Solidus default branch #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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