Merge pull request #60 from CyberBLN/fix_travis-ci

BUGFIX: file ../unit-tests/ci/phalcon.ini does not exist
fabfuel · Sep 28, 2016 · cf888c5 · cf888c5
2 parents 5568d72 + 9c37413
commit cf888c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,8 @@ php:
 
 before_script:
   - ./tests/install-php-extension.sh
-  - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - php --ri phalcon > /dev/null || echo "extension=\"phalcon.so\"" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - php --ri mongo > /dev/null || echo "extension=\"mongo.so\"" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - composer self-update
   - composer install --prefer-dist -o
 

diff --git a/tests/install-php-extension.sh b/tests/install-php-extension.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b master
-cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini
+cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install