Skip to content

Commit

Permalink
Merge pull request #15 from 0x46616c6b/multi-php-version-support
Browse files Browse the repository at this point in the history
Add test environment for PHP 7.2 & 7.3
  • Loading branch information
0x46616c6b authored Mar 6, 2019
2 parents af15c04 + a15aa9b commit 30dd5b3
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 7 deletions.
62 changes: 58 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: 2

jobs:
build:
test_php71:
docker:
- image: circleci/php:7.1
- image: systemli/etherpad-lite:1.7.5
Expand All @@ -10,10 +9,10 @@ jobs:
- run: sudo composer self-update
- restore_cache:
keys:
- composer-{{ checksum "composer.lock" }}
- composer-php71-{{ checksum "composer.lock" }}
- run: composer install
- save_cache:
key: composer-{{ checksum "composer.lock" }}
key: composer-php71-{{ checksum "composer.lock" }}
paths:
- vendor
- run:
Expand All @@ -25,3 +24,58 @@ jobs:
- run:
name: Running Behat
command: vendor/bin/behat -f progress
test_php72:
docker:
- image: circleci/php:7.2
- image: systemli/etherpad-lite:1.7.5
steps:
- checkout
- run: sudo composer self-update
- restore_cache:
keys:
- composer-php72-{{ checksum "composer.lock" }}
- run: composer install
- save_cache:
key: composer-php72-{{ checksum "composer.lock" }}
paths:
- vendor
- run:
name: Running PHPUnit
command: vendor/bin/phpunit
- run:
name: Wait for Etherpad
command: dockerize -wait http://localhost:9001 -timeout 1m
- run:
name: Running Behat
command: vendor/bin/behat -f progress
test_php73:
docker:
- image: circleci/php:7.3
- image: systemli/etherpad-lite:1.7.5
steps:
- checkout
- run: sudo composer self-update
- restore_cache:
keys:
- composer-php73-{{ checksum "composer.lock" }}
- run: composer install
- save_cache:
key: composer-php73-{{ checksum "composer.lock" }}
paths:
- vendor
- run:
name: Running PHPUnit
command: vendor/bin/phpunit
- run:
name: Wait for Etherpad
command: dockerize -wait http://localhost:9001 -timeout 1m
- run:
name: Running Behat
command: vendor/bin/behat -f progress
workflows:
version: 2
build_and_test:
jobs:
- test_php71
- test_php72
- test_php73
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"psr-4": { "": "src/" }
},
"require": {
"php": "^7.1",
"php": "^7.1|^7.2|^7.3",
"guzzlehttp/guzzle": "~6.3"
},
"require-dev": {
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 30dd5b3

Please sign in to comment.