Skip to content

Commit

Permalink
Merge pull request #19 from 0x46616c6b/composer-upgrade
Browse files Browse the repository at this point in the history
upgrade dependencies
  • Loading branch information
0x46616c6b authored Nov 23, 2019
2 parents 6ec6bb5 + 44db2d3 commit 8866839
Show file tree
Hide file tree
Showing 4 changed files with 474 additions and 317 deletions.
25 changes: 0 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,5 @@
version: 2
jobs:
test_php71:
docker:
- image: circleci/php:7.1
- image: systemli/etherpad-lite:1.7.5
steps:
- checkout
- run: sudo composer self-update
- restore_cache:
keys:
- composer-php71-{{ checksum "composer.lock" }}
- run: composer install
- save_cache:
key: composer-php71-{{ 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_php72:
docker:
- image: circleci/php:7.2
Expand Down Expand Up @@ -76,6 +52,5 @@ workflows:
version: 2
build_and_test:
jobs:
- test_php71
- test_php72
- test_php73
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"psr-4": { "": "src/" }
},
"require": {
"php": "^7.1|^7.2|^7.3",
"guzzlehttp/guzzle": "~6.3"
"php": "^7.2.5|^7.3",
"guzzlehttp/guzzle": "~6.4"
},
"require-dev": {
"phpunit/phpunit": "~7.5",
Expand Down
Loading

0 comments on commit 8866839

Please sign in to comment.