Skip to content

Commit

Permalink
Build solidus_promotions on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mamhoff committed Oct 25, 2024
1 parent 4c75a16 commit fa25fd3
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 503 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ commands:
- run:
name: "Run Legacy Promotion Tests"
command: ./bin/build-ci legacy_promotions
- run:
name: "Run Friendly Promotion Tests"
command: ./bin/build-ci promotions

- store_artifacts:
path: /tmp/test-artifacts
Expand Down
3 changes: 3 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ Rails/ApplicationController:
Rails/ApplicationJob:
Exclude:
- "legacy_promotions/app/jobs/spree/promotion_code_batch_job.rb"
- "promotions/app/jobs/solidus_promotions/promotion_code_batch_job.rb"

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Expand Down Expand Up @@ -458,6 +459,8 @@ Rails/ReflectionClassName:
- "core/app/models/spree/user_address.rb"
- "core/app/models/spree/user_stock_location.rb"
- "core/app/models/spree/wallet_payment_source.rb"
- "promotions/app/models/solidus_promotions/condition_user.rb"
- "promotions/app/models/solidus_promotions/conditions/user.rb"

# Offense count: 23
# This cop supports safe autocorrection (--autocorrect).
Expand Down
11 changes: 10 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ end

group :admin do
gem 'solidus_admin', path: 'admin', require: false
gem 'tailwindcss-rails', '~> 3.0', require: false
gem 'tailwindcss-rails', '~> 2.0', require: false
gem 'axe-core-rspec', '~> 4.8', require: false
gem 'axe-core-capybara', '~> 4.8', require: false
end
Expand All @@ -70,6 +70,15 @@ group :legacy_promotions do
gem 'axe-core-capybara', '~> 4.8', require: false
end

group :promotions do
gem 'solidus_promotions', path: 'promotions', require: false
gem 'solidus_admin', path: 'admin', require: false
gem 'solidus_backend', path: 'backend', require: false
gem 'axe-core-rspec', '~> 4.8', require: false
gem 'axe-core-capybara', '~> 4.8', require: false
gem 'shoulda-matchers', '~> 5.0', require: false
end

group :lint do
gem 'erb-formatter', '~> 0.7', require: false
gem 'rubocop', '~> 1', require: false
Expand Down
4 changes: 2 additions & 2 deletions bin/build-ci
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ class Project
new('backend', test_type: :teaspoon, title: "backend JS", weight: 18),
new('core', weight: 266),
new('sample', weight: 28),
new('legacy_promotions', weight: 63)
new('legacy_promotions', weight: 63),
new('promotions', weight: 63)
]
end

Expand Down Expand Up @@ -114,7 +115,6 @@ class Project
end
end


if ENV['CIRCLE_NODE_INDEX'] # Run projects on a CI node
projects = Project.weighted_projects(
node_total: Integer(ENV.fetch('CIRCLE_NODE_TOTAL', 1)),
Expand Down
58 changes: 0 additions & 58 deletions promotions/.circleci/config.yml

This file was deleted.

5 changes: 0 additions & 5 deletions promotions/.gem_release.yml

This file was deleted.

2 changes: 0 additions & 2 deletions promotions/.github_changelog_generator

This file was deleted.

21 changes: 0 additions & 21 deletions promotions/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions promotions/.rspec

This file was deleted.

29 changes: 0 additions & 29 deletions promotions/.rubocop.yml

This file was deleted.

4 changes: 0 additions & 4 deletions promotions/.standard.yml

This file was deleted.

Loading

0 comments on commit fa25fd3

Please sign in to comment.