Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 11 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ orbs:
# to change this configuration every time a Solidus version is released
# or goes EOL.
solidusio_extensions: solidusio/extensions@volatile
slack: circleci/slack@4.9.3

commands:
setup:
Expand All @@ -20,44 +19,33 @@ commands:
gem install bundler -v '>=2.3.21' --conservative
bundle --version

notify:
steps:
- slack/notify:
event: fail
template: basic_fail_1
branch_pattern: master

jobs:
solidus-master:
executor:
name: solidusio_extensions/sqlite
ruby_version: '3.1'
steps: ['setup', 'solidusio_extensions/run-tests-solidus-master', 'notify']
steps: ['setup', 'solidusio_extensions/run-tests-solidus-master']
solidus-current:
executor:
name: solidusio_extensions/sqlite
ruby_version: '3.0'
steps: ['setup', 'solidusio_extensions/run-tests-solidus-current', 'notify']
steps: ['setup', 'solidusio_extensions/run-tests-solidus-current']
solidus-older:
executor:
name: solidusio_extensions/sqlite
ruby_version: '2.7'
steps: ['setup', 'solidusio_extensions/run-tests-solidus-older', 'notify']
steps: ['setup', 'solidusio_extensions/run-tests-solidus-older']
lint-code:
executor: solidusio_extensions/sqlite
steps: ['setup', 'solidusio_extensions/lint-code', 'notify']
steps: ['setup', 'solidusio_extensions/lint-code']

workflows:
"Run specs on supported Solidus versions":
jobs:
- solidus-master:
context: slack-secrets
- solidus-current:
context: slack-secrets
- solidus-older:
context: slack-secrets
- lint-code:
context: slack-secrets
- solidus-master
- solidus-current
- solidus-older
- lint-code

"Weekly run specs against master":
triggers:
Expand All @@ -68,9 +56,6 @@ workflows:
only:
- master
jobs:
- solidus-master:
context: slack-secrets
- solidus-current:
context: slack-secrets
- solidus-older:
context: slack-secrets
- solidus-master
- solidus-current
- solidus-older
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ gem 'solidus', github: 'solidusio/solidus', branch: branch
# A workaround for https://github.com/bundler/bundler/issues/6677
gem 'rails', '>0.a'

gem 'bundler'
gem 'rake'

# These gems will be used by the temporary extensions generated by tests
group :test do
gem 'mysql2'
Expand Down
3 changes: 0 additions & 3 deletions solidus_dev_support.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,4 @@ Gem::Specification.new do |spec|
spec.add_dependency 'rubocop-rspec', '~> 2.0'
spec.add_dependency 'solidus_core', ['>= 2.0', '< 4']
spec.add_dependency 'webdrivers', '>= 4.4'

spec.add_development_dependency 'bundler'
spec.add_development_dependency 'rake'
end