Skip to content
This repository has been archived by the owner on Jan 17, 2022. It is now read-only.

Commit

Permalink
chore(deps): upgrade dependencies (#158)
Browse files Browse the repository at this point in the history
Switch phpcov package to use "release" version not "master" branch. It was initially used to
workaround CI build issue.
  • Loading branch information
k911 authored Mar 6, 2020
1 parent 1763707 commit 25a1d40
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 70 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,29 +246,29 @@ jobs:
PHP_VERSION: 7.3
PHP_API_VERSION: "20180731"

php-73-latest:
php-73-lowest:
<<: *docker-env
<<: *docker-default
environment:
PHP_VERSION: 7.3
PHP_API_VERSION: "20180731"
COMPOSER_ARGS: update --ignore-platform-reqs
SWOOLE_VERSION: latest
COMPOSER_ARGS: update --prefer-lowest

php-73-lowest:
php-74:
<<: *docker-env
<<: *docker-default
environment:
PHP_VERSION: 7.3
PHP_API_VERSION: "20180731"
COMPOSER_ARGS: update --prefer-lowest
PHP_VERSION: 7.4
PHP_API_VERSION: "20190902"

php-74:
php-74-latest:
<<: *docker-env
<<: *docker-default
environment:
PHP_VERSION: 7.4
PHP_API_VERSION: "20190902"
COMPOSER_ARGS: update --ignore-platform-reqs
SWOOLE_VERSION: latest

check-composer-config:
docker:
Expand Down Expand Up @@ -347,7 +347,7 @@ workflows:
<<: *pull-request-checks-job-filters
requires:
- check-composer-config
- php-73-latest:
- php-74-latest:
<<: *pull-request-checks-job-filters
requires:
- check-composer-config
Expand Down Expand Up @@ -375,7 +375,7 @@ workflows:
<<: *release-job-filters
requires:
- check-composer-config
- php-73-latest:
- php-74-latest:
<<: *release-job-filters
requires:
- check-composer-config
Expand All @@ -388,7 +388,7 @@ workflows:
requires:
- php-73
- php-73-cc
- php-73-latest
- php-74-latest
- php-73-lowest
- shellcheck
- validate-commit-message
12 changes: 4 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ matrix:
env:
- "COMPOSER_ARGS='update --prefer-lowest'"
- php: "7.3"
- php: "7.3"
env:
- SWOOLE_LATEST=1
- COMPOSER_ARGS='update --ignore-platform-reqs'
- php: "7.3"
env:
- SWOOLE_LATEST=1
- COMPOSER_ARGS='install --ignore-platform-reqs'
- php: "7.3"
env:
- COMPOSER_ARGS=update
- php: "7.4"
- php: "7.4"
env:
- SWOOLE_LATEST=1
- php: "7.4"
env:
- SWOOLE_LATEST=1
Expand All @@ -38,10 +38,6 @@ matrix:
env:
- SWOOLE_LATEST=1
- COMPOSER_ARGS='update --ignore-platform-reqs'
# - php: "7.3"
# env:
# - SWOOLE_LATEST=1
# - COMPOSER_ARGS='install --ignore-platform-reqs'

before_script:
- phpenv config-rm xdebug.ini
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"phpstan/phpstan-doctrine": "^0.12.9",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpunit/php-code-coverage": "^8.0.1",
"phpunit/phpcov": "dev-master as 7.0.1",
"phpunit/phpcov": "^7.0.2",
"phpunit/phpunit": "^9.0.1",
"swoole/ide-helper": "~4.4.7",
"symfony/debug": "^4.3.1|^5.0",
Expand Down Expand Up @@ -118,7 +118,7 @@
"process-timeout": 1200,
"sort-packages": true,
"platform": {
"php": "7.4.2",
"php": "7.3.13",
"ext-swoole": "4.4.15"
}
}
Expand Down
88 changes: 39 additions & 49 deletions composer.lock

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

0 comments on commit 25a1d40

Please sign in to comment.