From 3de04acaf431a43c35ed474366da7e7b52bcc989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 3 Feb 2021 22:44:18 +0100 Subject: [PATCH 1/6] Rethink TravisCI configuration --- .travis.yml | 65 +++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a5652c..15862db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,42 +1,37 @@ -dist: xenial -lang: php -compiler: - - gcc -cache: - directories: - - /home/travis/.phpenv/ -env: - global: - - MEMPROF_CFLAGS='-Wall -Werror' +# TravisCI configuration for arnaud-lb/php-memory-profiler + +if: "branch = v2" + +language: "php" +os: + - "linux" +dist: "bionic" + +addons: + apt: + packages: + - "libjudy-dev" + - "libonig-dev" + - "libzip-dev" + +php: + - "8.0" + - "7.4" + - "7.3" + - "7.2 + - "7.1" + jobs: - allow_failures: - - env: PHP_VERSION=8.0snapshot fast_finish: true - include: - - env: PHP_VERSION=8.0snapshot - - env: PHP_VERSION=7.4.12 - - env: PHP_VERSION=7.3.24 - - env: PHP_VERSION=7.2.19 - - env: PHP_VERSION=7.1.33 before_install: - - | - # Use a non-zts PHP build - set -e - sudo apt-get install libjudy-dev libonig-dev libzip-dev - if ! [ -f $HOME/.phpenv/memprof-travis-cached ]; then - echo "Building PHP" - git clone git://github.com/php-build/php-build.git $HOME/.phpenv/plugins/php-build - phpenv install --verbose --force $PHP_VERSION - rm -rf $HOME/.phpenv/plugins/php-build - touch $HOME/.phpenv/memprof-travis-cached - else - echo "PHP already built" - fi - phpenv rehash - phpenv global $PHP_VERSION + - "phpenv config-rm xdebug.ini" install: - - .travis/build.sh + - "phpize" + - "CFLAGS='-Wall -Werror' ./configure" + - "make" + script: - - .travis/test.sh + - "php --ri memprof" + - "REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=\"$(realpath \"$(which php)\")\" php run-tests.php -s -q --show-diff" From 9c78d314e2b5ccf8fd499718ade2f3010ab88b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 3 Feb 2021 22:49:43 +0100 Subject: [PATCH 2/6] Fix YAML syntax --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15862db..e749a27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ php: - "8.0" - "7.4" - "7.3" - - "7.2 + - "7.2" - "7.1" jobs: @@ -29,7 +29,7 @@ before_install: install: - "phpize" - - "CFLAGS='-Wall -Werror' ./configure" + - "CFLAGS=\"-Wall -Werror\" ./configure" - "make" script: From 4931ba09c6947de287bee2cf1cbe5777a53c86d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Thu, 4 Feb 2021 01:32:06 +0100 Subject: [PATCH 3/6] Update .travis.yml --- .travis.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e749a27..e8b5e8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,25 @@ php: jobs: fast_finish: true +cache: + directories: + - "${HOME}/.phpenv/" + before_install: - - "phpenv config-rm xdebug.ini" + - | + # Using PHP ZTS + PHP_VERSION="$(php -r 'echo PHP_VERSION;')" + if ! [ -f "${HOME}/.phpenv/php-zts-built" ]; then + echo "Building PHP ZTS ${PHP_VERSION} ..." + git clone git://github.com/php-build/php-build.git "${HOME}/.phpenv/plugins/php-build" + phpenv install --verbose --force "${PHP_VERSION}" + rm -rf "${HOME}/.phpenv/plugins/php-build" + touch "${HOME}/.phpenv/php-zts-built" + fi + phpenv rehash + phpenv global "${PHP_VERSION}" + phpenv config-rm xdebug.ini + php -v install: - "phpize" From 08b4a11cd27a079e2a98e279fd8d8ab5bfed0220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Thu, 4 Feb 2021 02:01:47 +0100 Subject: [PATCH 4/6] Update .travis.yml --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8b5e8a..9f4ba0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,14 +30,14 @@ cache: before_install: - | - # Using PHP ZTS + # Using PHP non-ZTS PHP_VERSION="$(php -r 'echo PHP_VERSION;')" - if ! [ -f "${HOME}/.phpenv/php-zts-built" ]; then + if ! [ -f "${HOME}/.phpenv/php-non-zts-built" ]; then echo "Building PHP ZTS ${PHP_VERSION} ..." git clone git://github.com/php-build/php-build.git "${HOME}/.phpenv/plugins/php-build" phpenv install --verbose --force "${PHP_VERSION}" rm -rf "${HOME}/.phpenv/plugins/php-build" - touch "${HOME}/.phpenv/php-zts-built" + touch "${HOME}/.phpenv/php-non-zts-built" fi phpenv rehash phpenv global "${PHP_VERSION}" @@ -47,7 +47,9 @@ before_install: install: - "phpize" - "CFLAGS=\"-Wall -Werror\" ./configure" - - "make" + - "make -j \"$(nproc)\"" + - "echo \"extension = $(realpath modules/memprof.so)\" >modules/memprof.ini" + - "phpenv config-add modules/memprof.ini" script: - "php --ri memprof" From 804dbf7b9c6e3e8c1521a30f6aba20a0819eb92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Thu, 4 Feb 2021 02:14:11 +0100 Subject: [PATCH 5/6] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f4ba0e..bcc73f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ before_install: install: - "phpize" - "CFLAGS=\"-Wall -Werror\" ./configure" - - "make -j \"$(nproc)\"" + - "make" - "echo \"extension = $(realpath modules/memprof.so)\" >modules/memprof.ini" - "phpenv config-add modules/memprof.ini" From c503d1f7d110bade67beeb24233540431d39cb47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Thu, 4 Feb 2021 01:20:55 +0000 Subject: [PATCH 6/6] Remove travis scripts --- .travis/build.sh | 12 ------------ .travis/test.sh | 8 -------- 2 files changed, 20 deletions(-) delete mode 100755 .travis/build.sh delete mode 100755 .travis/test.sh diff --git a/.travis/build.sh b/.travis/build.sh deleted file mode 100755 index 972d113..0000000 --- a/.travis/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -xve - -if ! grep -q memprof.so ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; then - echo "extension = $(pwd)/modules/memprof.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini -fi -phpenv config-rm xdebug.ini || true - -phpize -CFLAGS=$MEMPROF_CFLAGS ./configure -make diff --git a/.travis/test.sh b/.travis/test.sh deleted file mode 100755 index 923bea4..0000000 --- a/.travis/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -xve - -export PATH=$TRAVIS_BUILD_DIR/.travis:$PATH - -PHP=$(which php) -REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE="$PHP" "$PHP" run-tests.php -s -q --show-diff