Skip to content

Commit

Permalink
Merge pull request #7 from zachleigh/only-complile-php7-with-zephir
Browse files Browse the repository at this point in the history
Only use Zephir for php7 and dropping support of PHP5.4.
  • Loading branch information
virgofx authored Apr 7, 2017
2 parents 9c83fd1 + 646475e commit b5a827e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The following table outlines general compability of Phalcon inside various CI en
| PHP CI Version | Phalcon Version(s) | CI Environment |
|:---------------|:-------------------|:---------------|
| 5.3 | ✖ (Not supported) | - |
| 5.4 | `master`, `2.0.x`, `3.0.x` | ✔ CircleCI, Travis CI, Scrutinizer, Codeship, Shippable |
| 5.4 | (Not supported) | - |
| 5.5 |`master`, `2.0.x`, `3.0.x` | ✔ CircleCI, Travis CI, Scrutinizer, Codeship, Shippable |
| 5.6 |`master`, `2.0.x`, `3.0.x` | ✔ CircleCI, Travis CI, Scrutinizer, Codeship, Shippable |
| 7.0 |`3.0.x` | ✔ CircleCI, Travis CI, Scrutinizer, Codeship, Shippable |
Expand Down Expand Up @@ -111,7 +111,6 @@ test:
language: php
php:
- 5.4
- 5.5
- 5.6
- 7.0
Expand Down
20 changes: 7 additions & 13 deletions bin/install-phalcon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,11 @@ cd ${PHALCON_DIR}/ext
# Build Phalcon.
echo "Building Phalcon for ${PHP_VER} ..."

# Temporarilly using zephir for all builds. Once https://github.com/phalcon/cphalcon/issues/11961
# gets fixed we can revert to only PHP7 using zephir.

# Various CI Providers including Codeship, CircleCI have issues when compiling Zephir
# and require higher PHP limits even though the container has adaquete memory.
echo "memory_limit=-1" > ${PHP_CONF_DIR}/phalcon-ci-installer.ini

# if [[ $PHP_VER == 7* ]]; then
if [[ $PHP_VER == 7* ]]; then

# Note that Codeship has potential to set only the local PHP environment since this
# option is how the environment is setup. Documentation references using `phpenv local ...`
Expand All @@ -154,11 +151,8 @@ echo "memory_limit=-1" > ${PHP_CONF_DIR}/phalcon-ci-installer.ini

# Compile
cd ${PHALCON_DIR}
if [[ $PHP_VER == 7* ]]; then
${CI_APP_DIR}/vendor/phalcon/zephir/bin/zephir compile --backend=ZendEngine3
else
${CI_APP_DIR}/vendor/phalcon/zephir/bin/zephir compile
fi

${CI_APP_DIR}/vendor/phalcon/zephir/bin/zephir compile --backend=ZendEngine3

# Install
cd ${PHALCON_DIR}/ext
Expand All @@ -168,10 +162,10 @@ echo "memory_limit=-1" > ${PHP_CONF_DIR}/phalcon-ci-installer.ini
./configure --enable-phalcon
make --silent -j4
make --silent install
# else
# cd ${PHALCON_DIR}/build
# ./install
# fi
else
cd ${PHALCON_DIR}/build
./install
fi

# Ensure extension exists
echo "extension=phalcon.so" > ${PHP_CONF_DIR}/phalcon.ini
Expand Down

0 comments on commit b5a827e

Please sign in to comment.