Skip to content

Reduce build time on Travis CI #1898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Reduce build time on Travis CI #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c9ad1e
bugfix: improve readline prefix lookup
c9s May 9, 2016
eaa0ccb
Enable config.cache since the system settings are always the same on …
c9s May 4, 2016
7b59983
Use long option name
c9s Feb 23, 2017
9cf7098
Fix .ccache directory
c9s Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ notifications:
on_success: change
on_failure: always

cache:
- apt

cache:
apt: true
ccache: true
directories:
- ~/.ccache
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to https://docs.travis-ci.com/user/caching/#ccache-cache this is already part of ccache: true.

env:
global:
- MYSQL_TEST_HOST=127.0.0.1
Expand All @@ -45,15 +47,21 @@ env:
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1

before_script:
# Compile PHP
- ./travis/compile.sh
# Setup Extensions
- . ./travis/ext/mysql/setup.sh
- . ./travis/ext/mysqli/setup.sh
- . ./travis/ext/pdo_mysql/setup.sh
- . ./travis/ext/pgsql/setup.sh
- . ./travis/ext/pdo_pgsql/setup.sh
- ccache --version
- ccache --zero-stats
- export USE_CCACHE=1
# Compile PHP
- ./travis/compile.sh
# Setup Extensions
- . ./travis/ext/mysql/setup.sh
- . ./travis/ext/mysqli/setup.sh
- . ./travis/ext/pdo_mysql/setup.sh
- . ./travis/ext/pgsql/setup.sh
- . ./travis/ext/pdo_pgsql/setup.sh

# Run PHPs run-tests.php
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120

after_success:
- ccache --show-stats
6 changes: 4 additions & 2 deletions ext/readline/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ else
fi

if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
for i in $PHP_READLINE /usr/local /usr; do
dnl /opt/local macports prefix
dnl /usr/local/opt homebrew link prefix
for i in $PHP_READLINE /opt/local /usr/local/opt /usr/local /usr; do
test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
done

Expand Down Expand Up @@ -71,7 +73,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then

elif test "$PHP_LIBEDIT" != "no"; then

for i in $PHP_LIBEDIT /usr/local /usr; do
for i in $PHP_LIBEDIT /opt/local /usr/local/opt /usr/local /usr; do
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like some unrelated changes got mixed up here.

test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
done

Expand Down
3 changes: 2 additions & 1 deletion travis/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ if [[ "$ENABLE_DEBUG" == 1 ]]; then
else
DEBUG="";
fi
./buildconf --force
./buildconf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As @Tyrael pointed out in #1898 (comment), it seems that we do need --force after all. I would suggest to keep the configure-related changes out of this PR, i.e. add back --force here and drop the --config-cache option form configure.

./configure \
--config-cache \
--prefix=$HOME"/php-install" \
--quiet \
$DEBUG \
Expand Down