Permalink
Browse files

tweaked travis configuration

  • Loading branch information...
fabpot committed Oct 8, 2015
1 parent 42f95a7 commit 38c2fda06175f6088b58214bfe43e936bc6f2836
Showing with 54 additions and 55 deletions.
  1. BIN .blackfire.travis.ini.enc
  2. +19 −2 .travis.yml
  3. +1 −1 composer.json
  4. +34 −52 composer.lock
View
Binary file not shown.
View
@@ -12,6 +12,8 @@ matrix:
env: TWIG=1.x
- php: 5.5
- php: 5.6
+ - php: 5.6
+ env: BLACKFIRE=on
- php: 7.0
- php: hhvm
@@ -21,11 +23,26 @@ cache:
- $HOME/.composer/cache/files
before_install:
- - sh -c "if [ '$TWIG' = '2.x' ]; then sed -i 's/~1.20|~2.0/~2.0/g' composer.json; composer update; fi"
- - sh -c "if [ '$TWIG' = '1.x' ]; then sed -i 's/~1.20|~2.0/~1.20/g' composer.json; composer update; fi"
+ - |
+ if [[ "$BLACKFIRE" = "on" ]]; then
+ openssl aes-256-cbc -K $encrypted_16ab3ffdcd52_key -iv $encrypted_16ab3ffdcd52_iv -in .blackfire.travis.ini.enc -out ~/.blackfire.ini -d
+ curl -L https://blackfire.io/api/v1/releases/agent/linux/amd64 | tar zxpf -
+ chmod 755 agent && ./agent --config=~/.blackfire.ini --socket=unix:///tmp/blackfire.sock &
+ fi
+ - if [[ "$TWIG" = "2.x" ]]; then sed -i 's/~1.20|~2.0/~2.0/g' composer.json; composer update; fi
+ - if [[ "$TWIG" = "1.x" ]]; then sed -i 's/~1.20|~2.0/~1.20/g' composer.json; composer update; fi
install:
- travis_retry composer install
+before_script:
+ - phpenv config-rm xdebug.ini || true
+ - |
+ if [[ "$BLACKFIRE" = "on" ]]; then
+ curl -L https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(phpenv version-name | tr -d '.')-zts | tar zxpf -
+ echo "extension=$(pwd)/$(ls blackfire-*.so | tr -d '[[:space:]]')" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/blackfire.ini
+ echo "blackfire.agent_socket=unix:///tmp/blackfire.sock" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/blackfire.ini
+ fi
+
script:
- phpunit
View
@@ -23,7 +23,7 @@
"symfony/yaml": "~2.1",
"symfony/process": "~2.1",
"phpdocumentor/reflection-docblock": "~2.0",
- "blackfire/php-sdk": "dev-php-sdk-plus"
+ "blackfire/php-sdk": "^1.3.1"
},
"autoload": {
"psr-4": { "Sami\\": "Sami/" }
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 38c2fda

Please sign in to comment.