Skip to content
Permalink
Browse files

Improved install script [skip appveyor]

  • Loading branch information...
sergeyklay committed Oct 6, 2019
1 parent 15c9c30 commit 621d88680169640715041990f5d52afd33fe7c11
Showing with 5 additions and 7 deletions.
  1. +1 −2 .ci/install-zephir.sh
  2. +4 −5 .travis.yml
@@ -33,7 +33,6 @@ then
else
git clone -b "$ZEPHIR_VERSION" --depth 1 -q https://github.com/phalcon/zephir
cd zephir || exit 1
echo "composer install ${DEFAULT_COMPOSER_FLAGS[*]}"
eval "composer install ${DEFAULT_COMPOSER_FLAGS[*]}"
eval "composer install $DEFAULT_COMPOSER_FLAGS"
ln -s "$(pwd)/zephir" "$HOME/bin/zephir"
fi
@@ -44,6 +44,7 @@ env:
- REPORT_COVERAGE=1
- PATH="${HOME}/.composer/vendor/bin:${PATH}"
- TRAVIS_COMMIT_LOG="$(git log --format=fuller -5)"
- DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest"

before_install:
- |
@@ -59,12 +60,10 @@ before_install:
[ -d ~/bin ] || mkdir ~/bin
export PHP_PEAR_PHP_BIN="$(phpenv which php)"
DEFAULT_COMPOSER_FLAGS=("--no-interaction" "--no-ansi" "--no-progress" "--no-suggest")
if [ "$(php-config --vernum)" -ge "70400" ]
then
DEFAULT_COMPOSER_FLAGS+=("--ignore-platform-reqs")
export DEFAULT_COMPOSER_FLAGS="$DEFAULT_COMPOSER_FLAGS --ignore-platform-reqs"
fi
export DEFAULT_COMPOSER_FLAGS
# Hide "You are in 'detached HEAD' state" message
git config --global advice.detachedHead false
@@ -75,7 +74,7 @@ install:
- .ci/setup-dbs.sh
- .ci/install-zephir.sh
- .ci/install-php-extensions.sh
- travis_retry composer install ${DEFAULT_COMPOSER_FLAGS[*]}
- eval "composer install $DEFAULT_COMPOSER_FLAGS"

before_script:
- cat .ci/travis.ini >> "$(phpenv prefix)/etc/conf.d/travis.ini"
@@ -103,7 +102,7 @@ jobs:
env:
- REPORT_COVERAGE=0
install:
- travis_retry composer install ${DEFAULT_COMPOSER_FLAGS[*]} --ignore-platform-reqs
- eval "composer install $DEFAULT_COMPOSER_FLAGS --ignore-platform-reqs"
before_script:
- phpenv config-rm xdebug.ini || true
script:

0 comments on commit 621d886

Please sign in to comment.
You can’t perform that action at this time.