Skip to content

Commit

Permalink
Update circleci config (#25)
Browse files Browse the repository at this point in the history
* Update circleci config
* Update phpunit and phpcs

* Add conflict for older php_codesniffer

* Set min drupal/coder

* Update version of dbal

* Update min php version
  • Loading branch information
kimpepper authored Feb 22, 2021
1 parent 3406247 commit ff6076a
Show file tree
Hide file tree
Showing 8 changed files with 1,534 additions and 314 deletions.
36 changes: 36 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: 2.1

executors:
php74:
docker:
- image: skpr/php-cli:7.4-1.x
php80:
docker:
- image: skpr/php-cli:8.0-1.x

workflows:
build:
jobs:
- build:
matrix:
parameters:
php: ["php74", "php80"]
composer-opts: ["", "--prefer-lowest"]

jobs:
build:
parameters:
php:
type: executor
composer-opts:
type: string
executor: << parameters.php >>
working_directory: /data
steps:
- checkout
- run: composer2 update --prefer-dist --no-progress --no-suggest --no-interaction --optimize-autoloader << parameters.composer-opts >>
- run: ./bin/phpcs --colors --report=full --runtime-set testVersion 8.0-
- run: mkdir -p build/phpunit
- run: ./bin/phpunit --log-junit build/phpunit/results.xml
- store_test_results:
path: build
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/bin/
/vendor/
*.sqlite
.phpunit.result.cache
18 changes: 0 additions & 18 deletions Makefile

This file was deleted.

23 changes: 17 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "previousnext/nested-set",
"description": "A PHP Doctrine DBAL implementation for Nested Sets.",
"type": "library",
"license": "GPL-2.0+",
"license": "GPL-2.0-or-later",
"authors": [
{
"name": "Kim Pepper",
Expand All @@ -12,12 +12,16 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"doctrine/dbal": "~2.5"
"php": "^7.3 || ^8.0",
"doctrine/dbal": "^2.12.1"
},
"require-dev": {
"phpunit/phpunit": "~4.8",
"drupal/coder": "~8.0",
"pear/console_table": "^1.3"
"ext-pdo_sqlite": "*",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"drupal/coder": "^8.3.12",
"pear/console_table": "^1.3",
"phpcompatibility/php-compatibility": "^9.3",
"phpunit/phpunit": "^8.5 || ^9.3"
},
"autoload": {
"psr-4": {
Expand All @@ -30,6 +34,13 @@
}
},
"config": {
"bin-dir": "bin/"
"bin-dir": "bin",
"preferred-install": {
"*": "dist"
},
"sort-packages": true
},
"conflict": {
"squizlabs/php_codesniffer": "<3.5.8"
}
}
Loading

0 comments on commit ff6076a

Please sign in to comment.