Skip to content

Commit

Permalink
Adopt new Solidus default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
waiting-for-dev committed May 9, 2023
1 parent aa50d74 commit 12fe5f4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
bin/dummy-app
environment:
FRONTEND: starter
SOLIDUS_BRANCH: master
SOLIDUS_BRANCH: main
- save_cache:
key: solidus-stripe-gems-v1-{{ checksum "/tmp/.tool-versions" }}
paths:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ In order to map these concepts SolidusStripe will match states in a slightly une
Reference:

- https://stripe.com/docs/payments/intents?intent=payment
- https://github.com/solidusio/solidus/blob/master/core/lib/spree/core/state_machines/payment.rb
- https://github.com/solidusio/solidus/blob/main/core/lib/spree/core/state_machines/payment.rb

## Development

Expand Down
2 changes: 1 addition & 1 deletion bin/dummy-app
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ echo "gem 'simplecov', '~> 0.22', require: false" >> Gemfile
echo "gem 'simplecov-cobertura', require: false" >> Gemfile
unbundled bundle install

unbundled bundle add solidus --github solidusio/solidus --branch "${SOLIDUS_BRANCH:-master}" --version '> 0.a'
unbundled bundle add solidus --github solidusio/solidus --branch "${SOLIDUS_BRANCH:-main}" --version '> 0.a'
unbundled bundle exec rake db:drop db:create
unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none --no-seed --no-sample "$@"
unbundled bundle add $extension_name --path ..
Expand Down
2 changes: 1 addition & 1 deletion bin/rails-new
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ else

cd "$app_path"
unbundled bundle add listen --group development
unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-master}" --version '> 0.a'
unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
unbundled bundle exec rake db:drop db:create
unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none
cd "${root_path}"
Expand Down

0 comments on commit 12fe5f4

Please sign in to comment.