From 3c289f59eedfbf331780fa83dc9ae85055cc9463 Mon Sep 17 00:00:00 2001 From: Paolo Cuffiani Date: Wed, 13 Mar 2019 11:34:51 +0100 Subject: [PATCH 1/2] #49 chore: update XDebug to stable channel for PHP 7.3 --- dev/7.3/Dockerfile | 2 +- dev/7.3/apache/Dockerfile | 2 +- dev/7.3/fpm/Dockerfile | 2 +- dev/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/7.3/Dockerfile b/dev/7.3/Dockerfile index f5ed42b..c882907 100644 --- a/dev/7.3/Dockerfile +++ b/dev/7.3/Dockerfile @@ -2,5 +2,5 @@ FROM chialab/php:7.3 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN pecl install xdebug-2.7.0beta1 \ +RUN pecl install xdebug \ && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/7.3/apache/Dockerfile b/dev/7.3/apache/Dockerfile index c941d16..63d2e8c 100644 --- a/dev/7.3/apache/Dockerfile +++ b/dev/7.3/apache/Dockerfile @@ -2,5 +2,5 @@ FROM chialab/php:7.3-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN pecl install xdebug-2.7.0beta1 \ +RUN pecl install xdebug \ && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/7.3/fpm/Dockerfile b/dev/7.3/fpm/Dockerfile index 7480a3c..c5dd80e 100644 --- a/dev/7.3/fpm/Dockerfile +++ b/dev/7.3/fpm/Dockerfile @@ -2,5 +2,5 @@ FROM chialab/php:7.3-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN pecl install xdebug-2.7.0beta1 \ +RUN pecl install xdebug \ && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/Dockerfile b/dev/Dockerfile index 805c85e..c05506b 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -2,5 +2,5 @@ FROM chialab/php:latest LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN pecl install xdebug-2.7.0beta1 \ +RUN pecl install xdebug \ && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini From 245f83b34a0945ec8d2d49ac1fcce6a44624a1a1 Mon Sep 17 00:00:00 2001 From: Paolo Cuffiani Date: Wed, 13 Mar 2019 11:40:17 +0100 Subject: [PATCH 2/2] [minor] chore: remove `travis_wait` where not necessary --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b44dcb8..1dae24d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ env: install: - travis_wait 30 make build VERSION=${VERSION} -- if [ "$NO_DEV" != "1" ]; then travis_wait 30 make -C dev build VERSION=${VERSION}; fi +- if [ "$NO_DEV" != "1" ]; then make -C dev build VERSION=${VERSION}; fi script: - make test VERSION=${VERSION} -- if [ "$NO_DEV" != "1" ]; then travis_wait 30 make -C dev test VERSION=${VERSION}; fi +- if [ "$NO_DEV" != "1" ]; then make -C dev test VERSION=${VERSION}; fi