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

Commit

Permalink
Merge pull request #555 from kevinpapst/buildsystem
Browse files Browse the repository at this point in the history
Fix travis build
  • Loading branch information
kevinpapst committed Feb 7, 2016
2 parents b101aef + 1f38a6c commit 4f13de9
Show file tree
Hide file tree
Showing 7 changed files with 497 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/.project
*.*~

vendor/
core/temporary/*.txt
autoconf.php
.settings
Expand Down
6 changes: 2 additions & 4 deletions .travis.install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ set -x
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] || [ "$TRAVIS_PHP_VERSION" = 'hhvm-nightly' ] ; then
curl -sS https://getcomposer.org/installer > composer-installer.php
hhvm composer-installer.php
hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar update --prefer-source
hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar install --dev --prefer-source
hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar install
else
composer self-update
composer update --prefer-source
composer install --dev --prefer-source
composer install
fi
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
Expand All @@ -19,4 +18,4 @@ before_script:
- ./.travis.install.sh

script:
- ./bin/phpunit --configuration=phpunit.travis.xml
- ./vendor/bin/phpunit --configuration=phpunit.travis.xml
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"name": "kimai/kimai",
"type": "project",
"description": "Open Source Time Tracking",
"description": "Time Tracking with PHP",
"keywords": ["timetracking", "projectmanagement"],
"homepage": "https://github.com/kimai/kimai",
"license": "GPL-3.0",
"minimum-stability": "dev",
"time": "2013-08-03",
"version": "0.9.3-beta1",
"version": "0.9.3",
"authors": [
{
"name": "Severin Leonhardt",
Expand All @@ -19,7 +17,7 @@
}
],
"require": {
"php" : ">=5.3.0"
"php" : ">=5.4.0"
},
"require-dev" : {
"phpunit/phpunit" : "3.7.*"
Expand Down
Loading

0 comments on commit 4f13de9

Please sign in to comment.