Skip to content

Commit d09463f

Browse files
committed
Refs #4825.Stop using parameters in favor of separate jobs for each DB.
1 parent 80e230f commit d09463f

File tree

1 file changed

+43
-22
lines changed

1 file changed

+43
-22
lines changed

.circleci/config.yml

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ defaults: &defaults
88
UNISH_DB_URL: mysql://root:@127.0.0.1
99
PHPUNIT_ARGS: ""
1010

11+
test_71_steps: &test71steps
12+
steps:
13+
- checkout
14+
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
15+
- run: composer install
16+
- run: $HOME/drush/.circleci/patch.sh
17+
- run: composer lint
18+
- run: composer functional
19+
1120
version: 2.1
1221
jobs:
1322
# Code style test:
@@ -23,9 +32,9 @@ jobs:
2332
- run: composer install
2433
- run: composer cs
2534

26-
# Mergable test:
35+
# Mergeable test:
2736
# FAIL if merging test branch with master produces conflicts
28-
# PASS if the test branch is out of date, but mergable without conflicts
37+
# PASS if the test branch is out of date, but mergeable without conflicts
2938
check_mergable:
3039
<<: *defaults
3140
docker:
@@ -38,31 +47,47 @@ jobs:
3847

3948
# PHP 7.1 test:
4049
# Checks the most common configuration.
41-
test_71:
42-
parameters:
43-
unish-db-url:
44-
type: string
45-
default: mysql://root:@127.0.0.1
50+
test_71_mysql:
4651
<<: *defaults
4752
docker:
4853
- image: wodby/php:7.1
4954
environment:
5055
- MYSQL_HOST=127.0.0.1
5156
- PHP_SENDMAIL_PATH=/dev/null
52-
- UNISH_DB_URL=<< unish-db-url >>
57+
- UNISH_DB_URL=mysql://root:@127.0.0.1
58+
- image: circleci/mysql:5.7.24
59+
<<: *test71steps
60+
61+
# See scheduled workflow
62+
test_71_sqlite:
63+
<<: *defaults
64+
docker:
65+
- image: wodby/php:7.1
66+
environment:
67+
- PHP_SENDMAIL_PATH=/dev/null
68+
- UNISH_DB_URL=mysql://root:@127.0.0.1
5369
- image: circleci/mysql:5.7.24
5470
- image: wodby/postgres:10.5
5571
environment:
5672
POSTGRES_PASSWORD: unish
5773
POSTGRES_DB: unish_dev
5874
POSTGRES_USER: unish
59-
steps:
60-
- checkout
61-
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
62-
- run: composer install
63-
- run: $HOME/drush/.circleci/patch.sh
64-
- run: composer lint
65-
- run: composer functional
75+
<<: *test71steps
76+
77+
# See scheduled workflow
78+
test_71_postgres:
79+
<<: *defaults
80+
docker:
81+
- image: wodby/php:7.1
82+
environment:
83+
- PHP_SENDMAIL_PATH=/dev/null
84+
- UNISH_DB_URL=mysql://root:@127.0.0.1
85+
- image: wodby/postgres:10.5
86+
environment:
87+
POSTGRES_PASSWORD: unish
88+
POSTGRES_DB: unish_dev
89+
POSTGRES_USER: unish
90+
<<: *test71steps
6691

6792
# PHP 7.2 test with HIGHEST dependencies:
6893
# Determines whether a newer version of a dependency has broken Drush.
@@ -118,7 +143,7 @@ workflows:
118143
jobs:
119144
- code_style
120145
- check_mergable
121-
- test_71:
146+
- test_71_mysql:
122147
requires:
123148
- check_mergable
124149
- code_style
@@ -137,10 +162,6 @@ workflows:
137162
- master
138163
jobs:
139164
- test_72_highest
140-
- test_71:
141-
name: test_71_postgres
142-
unish-db-url: pgsql://unish:[email protected]
143-
- test_71:
144-
name: test_71_sqlite
145-
unish-db-url: sqlite://sut/sites/dev/files/.ht.sqlite
165+
- test_71_sqlite
166+
- test_71_postgres
146167

0 commit comments

Comments
 (0)