Skip to content

Commit

Permalink
Merge branch 'release/2.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Jul 7, 2020
2 parents 7334868 + b1f709c commit d5e3fc5
Show file tree
Hide file tree
Showing 26 changed files with 871 additions and 549 deletions.
42 changes: 3 additions & 39 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,15 @@
language: php
php:
- 5.6
- 7.0
- 7.1
- 7.2
- nightly

#env:
# global:
# - DB=mysql
# matrix:
# - GLPIVER=9.1/bugfixes
# - GLPIVER=master
- 7.4

before_script:
- composer self-update
# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
# - composer install --no-dev
# - mysql -u root -e 'create database glpitest;'
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
# - mv ../{LNAME} plugins/{LNAME}
# - cd plugins/{LNAME}
- composer install -o

- composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest

script:
- vendor/bin/robo --no-interaction code:cs
# - mysql -u root -e 'select version();'
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/


matrix:
# exclude:
# - php: 5.4
# env: GLPIVER=master
allow_failures:
- php: nightly
- vendor/bin/robo --no-interaction code:cs --strict

cache:
directories:
- $HOME/.composer/cache

#notifications:
# irc:
# channels:
# - "irc.freenode.org#channel"
# on_success: change
# on_failure: always
# use_notice: true
# skip_join: true
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"require": {
"php": "^7.2"
},
"require-dev": {
"glpi-project/tools": "^0.1"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "5.6"
}
"php": "7.2.0"
},
"sort-packages": true
}
}
Loading

0 comments on commit d5e3fc5

Please sign in to comment.