Skip to content

Commit cf094a9

Browse files
Update CI configuration
Run different Solidus versions on different jobs for better error handling. We're now explicitly providing the ruby version to the executor while using a matrix configuration for better extensibility. We're now running the linter on Ruby v3.0, as that's the minimal requirement for Solidus master. As a consequence, we disable the cop for following the gemspec version.
1 parent 97342f7 commit cf094a9

2 files changed

Lines changed: 39 additions & 31 deletions

File tree

.circleci/config.yml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,47 @@ orbs:
1111
solidusio_extensions: solidusio/extensions@volatile
1212

1313
jobs:
14-
run-specs-with-postgres:
14+
run-specs:
15+
parameters:
16+
solidus:
17+
type: string
18+
default: master
19+
db:
20+
type: string
21+
default: "postgres"
22+
ruby:
23+
type: string
24+
default: "3.2"
1525
executor:
16-
name: solidusio_extensions/postgres
17-
ruby_version: '3.1'
26+
name: solidusio_extensions/<< parameters.db >>
27+
ruby_version: << parameters.ruby >>
1828
steps:
1929
- checkout
2030
- browser-tools/install-chrome
21-
- solidusio_extensions/run-tests-solidus-master
22-
- solidusio_extensions/store-test-results
31+
- solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
2332

24-
run-specs-with-mysql:
25-
executor:
26-
name: solidusio_extensions/mysql
27-
ruby_version: '3.0'
28-
steps:
29-
- checkout
30-
- browser-tools/install-chrome
31-
- solidusio_extensions/run-tests-solidus-current
32-
- solidusio_extensions/store-test-results
33-
34-
run-specs-with-sqlite:
33+
lint-code:
3534
executor:
3635
name: solidusio_extensions/sqlite
37-
ruby_version: '2.7'
38-
steps:
39-
- checkout
40-
- browser-tools/install-chrome
41-
- solidusio_extensions/run-tests-solidus-older
42-
- solidusio_extensions/store-test-results
43-
44-
lint-code:
45-
executor: solidusio_extensions/sqlite
36+
ruby_version: "3.0"
4637
steps:
4738
- solidusio_extensions/lint-code
4839

4940
workflows:
5041
"Run specs on supported Solidus versions":
5142
jobs:
52-
- run-specs-with-postgres
53-
- run-specs-with-mysql
54-
- run-specs-with-sqlite
43+
- run-specs:
44+
name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
45+
matrix:
46+
parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
47+
- run-specs:
48+
name: *name
49+
matrix:
50+
parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
51+
- run-specs:
52+
name: *name
53+
matrix:
54+
parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
5555
- lint-code
5656

5757
"Weekly run specs against master":
@@ -63,6 +63,11 @@ workflows:
6363
only:
6464
- master
6565
jobs:
66-
- run-specs-with-postgres
67-
- run-specs-with-mysql
68-
- run-specs-with-sqlite
66+
- run-specs:
67+
name: *name
68+
matrix:
69+
parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
70+
- run-specs:
71+
name: *name
72+
matrix:
73+
parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ require:
55

66
AllCops:
77
NewCops: disable
8+
9+
Gemspec/RequiredRubyVersion:
10+
Enabled: false

0 commit comments

Comments
 (0)