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

Adopt new Solidus default branch #296

Merged
merged 1 commit into from
May 13, 2023
Merged

Adopt new Solidus default branch #296

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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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