-
Notifications
You must be signed in to change notification settings - Fork 27
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.
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
Add support for v4 #47
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,47 +11,40 @@ orbs: | |
solidusio_extensions: solidusio/extensions@volatile | ||
|
||
jobs: | ||
run-specs-with-sqlite: | ||
executor: | ||
name: solidusio_extensions/sqlite | ||
ruby_version: "3.0" | ||
steps: | ||
- browser-tools/install-chrome | ||
- solidusio_extensions/run-tests | ||
run-specs-with-postgres: | ||
executor: | ||
name: solidusio_extensions/postgres | ||
ruby_version: "3.2" | ||
ruby_version: "3.0" | ||
steps: | ||
- checkout | ||
- browser-tools/install-chrome | ||
- solidusio_extensions/run-tests-solidus-master | ||
- solidusio_extensions/store-test-results | ||
|
||
- solidusio_extensions/run-tests | ||
run-specs-with-mysql: | ||
executor: | ||
name: solidusio_extensions/mysql | ||
ruby_version: "3.1" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. Please do not change test config |
||
steps: | ||
- checkout | ||
- browser-tools/install-chrome | ||
- solidusio_extensions/run-tests-solidus-current | ||
- solidusio_extensions/store-test-results | ||
|
||
run-specs-with-sqlite: | ||
executor: | ||
name: solidusio_extensions/sqlite | ||
ruby_version: "3.0" | ||
steps: | ||
- checkout | ||
- browser-tools/install-chrome | ||
- solidusio_extensions/run-tests-solidus-older | ||
- solidusio_extensions/store-test-results | ||
|
||
- solidusio_extensions/run-tests | ||
lint-code: | ||
executor: solidusio_extensions/sqlite | ||
executor: | ||
name: solidusio_extensions/sqlite-memory | ||
ruby_version: "3.0" | ||
steps: | ||
- solidusio_extensions/lint-code | ||
|
||
workflows: | ||
"Run specs on supported Solidus versions": | ||
jobs: | ||
- run-specs-with-sqlite | ||
- run-specs-with-postgres | ||
- run-specs-with-mysql | ||
- run-specs-with-sqlite | ||
- lint-code | ||
|
||
"Weekly run specs against master": | ||
|
@@ -63,6 +56,6 @@ workflows: | |
only: | ||
- master | ||
jobs: | ||
- run-specs-with-sqlite | ||
- run-specs-with-postgres | ||
- run-specs-with-mysql | ||
- run-specs-with-sqlite |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1 @@ | ||
# Number of days of inactivity before an issue becomes stale | ||
daysUntilStale: 60 | ||
# Number of days of inactivity before a stale issue is closed | ||
daysUntilClose: 7 | ||
# Issues with these labels will never be considered stale | ||
exemptLabels: | ||
- pinned | ||
- security | ||
# Label to use when marking an issue as stale | ||
staleLabel: wontfix | ||
# Comment to post when marking an issue as stale. Set to `false` to disable | ||
markComment: > | ||
This issue has been automatically marked as stale because it has not had | ||
recent activity. It will be closed if no further activity occurs. Thank you | ||
for your contributions. | ||
# Comment to post when closing a stale issue. Set to `false` to disable | ||
closeComment: false | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this change related to the Solidus 4.0 upgrade? If yes, can you explain why? |
||
_extends: .github |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
issues=false | ||
exclude-labels=infrastructure | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Where does this change came from? Can you make this a separate commit. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,3 +15,7 @@ pkg | |
spec/dummy | ||
spec/examples.txt | ||
.ruby-version | ||
Gemfile-local | ||
/sandbox | ||
.rvmrc | ||
.ruby-gemset |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,14 +3,5 @@ inherit_from: .rubocop_todo.yml | |
require: | ||
- solidus_dev_support/rubocop | ||
|
||
inherit_gem: | ||
solidus_dev_support: .rubocop.yml | ||
|
||
AllCops: | ||
Exclude: | ||
- spec/dummy/**/* | ||
- vendor/**/* | ||
|
||
Rails/SkipsModelValidations: | ||
Exclude: | ||
- db/migrate/**/* | ||
NewCops: disable | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change also qualifies a separate commit |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
// Placeholder manifest file. | ||
// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js' | ||
// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
// Placeholder manifest file. | ||
// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js' | ||
// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,9 @@ | ||
#!/usr/bin/env ruby | ||
|
||
# frozen_string_literal: true | ||
|
||
app_root = 'spec/dummy' | ||
#!/usr/bin/env ruby | ||
|
||
unless File.exist? "#{app_root}/bin/rails" | ||
system "bin/rake", app_root or begin # rubocop:disable Style/AndOr | ||
warn "Automatic creation of the dummy app failed" | ||
exit 1 | ||
end | ||
if %w[g generate].include? ARGV.first | ||
exec "#{__dir__}/rails-engine", *ARGV | ||
else | ||
exec "#{__dir__}/rails-sandbox", *ARGV | ||
end | ||
|
||
Dir.chdir app_root | ||
exec 'bin/rails', *ARGV |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# frozen_string_literal: true | ||
|
||
#!/usr/bin/env ruby | ||
# This command will automatically be run when you run "rails" with Rails gems | ||
# installed from the root of your application. | ||
|
||
ENGINE_ROOT = File.expand_path('..', __dir__) | ||
ENGINE_PATH = File.expand_path('../lib/solidus_reports/engine', __dir__) | ||
|
||
# Set up gems listed in the Gemfile. | ||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) | ||
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) | ||
|
||
require 'rails/all' | ||
require 'rails/engine/commands' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# frozen_string_literal: true | ||
|
||
#!/usr/bin/env ruby | ||
|
||
app_root = 'sandbox' | ||
|
||
unless File.exist? '#{app_root}/bin/rails' | ||
warn 'Creating the sandbox app...' | ||
Dir.chdir '#{__dir__}/..' do | ||
system '#{__dir__}/sandbox' or begin | ||
warn 'Automatic creation of the sandbox app failed' | ||
exit 1 | ||
end | ||
end | ||
end | ||
|
||
Dir.chdir app_root | ||
exec 'bin/rails', *ARGV |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/usr/bin/env ruby | ||
# frozen_string_literal: true | ||
|
||
require 'rubygems' | ||
require 'bundler/setup' | ||
|
||
load Gem.bin_path('rake', 'rake') |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
# frozen_string_literal: true | ||
|
||
#!/usr/bin/env bash | ||
|
||
set -e | ||
test -z "${DEBUG+empty_string}" || set -x | ||
|
||
test "$DB" = "sqlite" && export DB="sqlite3" | ||
|
||
if [ -z "$SOLIDUS_BRANCH" ] | ||
then | ||
echo "~~> Use 'export SOLIDUS_BRANCH=[main|v3.2|...]' to control the Solidus branch" | ||
SOLIDUS_BRANCH="main" | ||
fi | ||
echo "~~> Using branch $SOLIDUS_BRANCH of solidus" | ||
|
||
if [ -z "$SOLIDUS_FRONTEND" ] | ||
then | ||
echo "~~> Use 'export SOLIDUS_FRONTEND=[solidus_frontend|solidus_starter_frontend]' to control the Solidus frontend" | ||
SOLIDUS_FRONTEND="solidus_frontend" | ||
fi | ||
echo "~~> Using branch $SOLIDUS_FRONTEND as the solidus frontend" | ||
|
||
extension_name="solidus_reports" | ||
|
||
# Stay away from the bundler env of the containing extension. | ||
function unbundled { | ||
ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@ | ||
} | ||
|
||
rm -rf ./sandbox | ||
unbundled bundle exec rails new sandbox \ | ||
--database="${DB:-sqlite3}" \ | ||
--skip-bundle \ | ||
--skip-git \ | ||
--skip-keeps \ | ||
--skip-rc \ | ||
--skip-spring \ | ||
--skip-test \ | ||
--skip-javascript | ||
|
||
if [ ! -d "sandbox" ]; then | ||
echo 'sandbox rails application failed' | ||
exit 1 | ||
fi | ||
|
||
cd ./sandbox | ||
cat <<RUBY >> Gemfile | ||
gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH' | ||
gem 'rails-i18n' | ||
gem 'solidus_i18n' | ||
gem '$extension_name', path: '..' | ||
group :test, :development do | ||
platforms :mri do | ||
gem 'pry-byebug' | ||
end | ||
end | ||
RUBY | ||
|
||
unbundled bundle install --gemfile Gemfile | ||
|
||
unbundled bundle exec rake db:drop db:create | ||
|
||
unbundled bundle exec rails generate solidus:install \ | ||
--auto-accept \ | ||
--user_class=Spree::User \ | ||
--enforce_available_locales=true \ | ||
--with-authentication=true \ | ||
--payment-method=none \ | ||
--frontend=${SOLIDUS_FRONTEND} \ | ||
$@ | ||
|
||
unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations | ||
unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations | ||
|
||
echo | ||
echo "🚀 Sandbox app successfully created for $extension_name!" | ||
echo "🧪 This app is intended for test purposes." |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,3 @@ | ||
#!/usr/bin/env bash | ||
set -euo pipefail | ||
IFS=$'\n\t' | ||
set -vx | ||
|
||
gem install bundler --conservative | ||
bundle update | ||
bundle exec rake extension:test_app | ||
bin/rake clobber |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,3 @@ | ||
# frozen_string_literal: true | ||
|
||
require 'solidus_core' | ||
require 'solidus_support' | ||
|
||
require 'solidus_reports/engine' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why have you changed the tested ruby version?