Skip to content

Commit 23e6389

Browse files
authored
Update circleci config (#1)
* Update circleci config * Update dev deps for lowest
1 parent 36273bc commit 23e6389

File tree

2 files changed

+40
-46
lines changed

2 files changed

+40
-46
lines changed

.circleci/config.yml

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,44 @@
1-
version: 2
1+
version: 2.1
22

33
workflows:
4-
version: 2
54
build:
65
jobs:
7-
- build_lowest
8-
- build_highest
9-
10-
defaults: &defaults
11-
docker:
12-
- image: previousnext/php-apache:7.2-3.x-dev
13-
working_directory: /data
14-
steps:
15-
- checkout
16-
- restore_cache:
17-
keys:
18-
- deps-{{ arch }}
19-
- run:
20-
name: "Install Dependencies"
21-
command: composer update --prefer-dist --no-progress --no-suggest --no-interaction ${PREFER_LOWEST}
22-
- save_cache:
23-
key: deps-{{ arch }}
24-
paths:
25-
- vendor
26-
- run:
27-
name: "Lint"
28-
command: ./bin/phpcs
29-
- run:
30-
name: "Test"
31-
command: |
32-
mkdir -p ~/phpunit
33-
./bin/phpunit --testsuite unit --log-junit ~/phpunit/phpunit.xml
34-
- store_test_results:
35-
path: ~/phpunit
36-
- store_artifacts:
37-
path: ~/phpunit
6+
- build:
7+
name: build_lowest
8+
composer_args: --prefer-lowest
9+
- build:
10+
name: build_highest
3811

3912
jobs:
40-
build_lowest:
41-
<<: *defaults
13+
build:
14+
parameters:
15+
composer_args:
16+
type: string
17+
default: ""
4218
docker:
43-
- image: previousnext/php-apache:7.1-3.x-dev
44-
45-
environment:
46-
- PREFER_LOWEST: --prefer-lowest
47-
build_highest:
48-
<<: *defaults
49-
environment:
50-
- PREFER_LOWEST: ''
19+
- image: skpr/php-circleci:7.4-1.x
20+
working_directory: /data
21+
steps:
22+
- checkout
23+
- restore_cache:
24+
keys:
25+
- deps-{{ arch }}
26+
- run:
27+
name: "Install Dependencies"
28+
command: composer update --prefer-dist --no-progress --no-suggest --no-interaction <<parameters.composer_args>>
29+
- save_cache:
30+
key: deps-{{ arch }}
31+
paths:
32+
- vendor
33+
- run:
34+
name: "Lint"
35+
command: ./bin/phpcs
36+
- run:
37+
name: "Test"
38+
command: |
39+
mkdir -p ~/phpunit
40+
./bin/phpunit --testsuite unit --log-junit ~/phpunit/phpunit.xml
41+
- store_test_results:
42+
path: ~/phpunit
43+
- store_artifacts:
44+
path: ~/phpunit

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"symfony/serializer": "^3.4||^4.4"
1616
},
1717
"require-dev": {
18-
"drupal/coder": ">=8.2.12",
19-
"phpunit/phpunit": "~8.5",
20-
"symfony/phpunit-bridge": "~3.4||^4.4"
18+
"drupal/coder": "^8.3.8",
19+
"phpunit/phpunit": "^8.5.4",
20+
"symfony/phpunit-bridge": "^4.4.8"
2121
},
2222
"autoload": {
2323
"psr-4": {"PNX\\Prometheus\\": "src/"}

0 commit comments

Comments
 (0)