From 608bdc09ed9d30ecc530f418523615cb0b4d81d9 Mon Sep 17 00:00:00 2001 From: sapics Date: Mon, 13 Apr 2020 12:14:05 +0900 Subject: Update Ubuntu from Trusty to Xenial on Travis PHP7.4+ have less updates in Trusty on Travis --- .travis.yml | 87 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8525d5f6c..b79543117 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,17 @@ language: php -dist: trusty +os: linux +dist: xenial php: - - 5.4 - - 5.5 - 5.6 - 7.0 - 7.1 - 7.2 - 7.3 - - 7.4snapshot + - 7.4 - nightly - - hhvm-3.30 - + env: - - DB=mysql - DB=mysqli - DB=pgsql - DB=sqlite @@ -22,7 +19,9 @@ env: - DB=pdo/pgsql - DB=pdo/sqlite -sudo: false +services: + - mysql + - postgresql before_script: - sh -c "composer install --dev --no-progress" @@ -32,28 +31,72 @@ before_script: script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml -matrix: +jobs: allow_failures: - - php: 7.4snapshot + - php: 7.4 - php: nightly - php: hhvm-3.30 - exclude: - - php: hhvm-3.30 + include: + - php: 5.4 + dist: trusty + env: DB=mysql + - php: 5.4 + dist: trusty + env: DB=mysqli + - php: 5.4 + dist: trusty env: DB=pgsql - - php: hhvm-3.30 + - php: 5.4 + dist: trusty + env: DB=sqlite + - php: 5.4 + dist: trusty + env: DB=pdo/mysql + - php: 5.4 + dist: trusty env: DB=pdo/pgsql - - php: 7.0 + - php: 5.4 + dist: trusty + env: DB=pdo/sqlite + - php: 5.5 + dist: trusty env: DB=mysql - - php: 7.1 - env: DB=mysql - - php: 7.2 - env: DB=mysql - - php: 7.3 - env: DB=mysql - - php: 7.4snapshot + - php: 5.5 + dist: trusty + env: DB=mysqli + - php: 5.5 + dist: trusty + env: DB=pgsql + - php: 5.5 + dist: trusty + env: DB=sqlite + - php: 5.5 + dist: trusty + env: DB=pdo/mysql + - php: 5.5 + dist: trusty + env: DB=pdo/pgsql + - php: 5.5 + dist: trusty + env: DB=pdo/sqlite + - php: 5.6 + dist: xenial env: DB=mysql - - php: nightly + - php: hhvm-3.30 + dist: trusty env: DB=mysql + - php: hhvm-3.30 + dist: trusty + env: DB=mysqli + - php: hhvm-3.30 + dist: trusty + env: DB=sqlite + - php: hhvm-3.30 + dist: trusty + env: DB=pdo/mysql + - php: hhvm-3.30 + dist: trusty + env: DB=pdo/sqlite branches: only: -- cgit v1.2.3-24-g4f1b From bbe58acbefcbe24afddd7f61cf61fda72632d137 Mon Sep 17 00:00:00 2001 From: sapics Date: Mon, 13 Apr 2020 16:09:11 +0900 Subject: Remove deprecated option "dev" dev packages are installed by default now --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b79543117..889d0455b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ services: - postgresql before_script: - - sh -c "composer install --dev --no-progress" + - sh -c "composer install --no-progress" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi" -- cgit v1.2.3-24-g4f1b From 16bc99b45d30953147721cd06bbb21fbe05c71b3 Mon Sep 17 00:00:00 2001 From: sapics Date: Mon, 13 Apr 2020 23:40:04 +0900 Subject: Fix error in Travis php7.4 test --- tests/codeigniter/helpers/text_helper_test.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php index 36465f203..e51d96a29 100644 --- a/tests/codeigniter/helpers/text_helper_test.php +++ b/tests/codeigniter/helpers/text_helper_test.php @@ -64,7 +64,12 @@ class Text_helper_test extends CI_TestCase { public function test_convert_accented_characters() { - $this->ci_vfs_clone('application/config/foreign_chars.php'); + $path = 'application/config/foreign_chars.php'; + $this->ci_vfs_clone($path); + if (is_php('7.4')) + { + copy(PROJECT_BASE.$path, APPPATH.'../'.$path); + } $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ')); $this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü')); } -- cgit v1.2.3-24-g4f1b From 183ae7c2d217c76a5c77fc555f612ad4fc71633e Mon Sep 17 00:00:00 2001 From: sapics Date: Mon, 13 Apr 2020 23:55:02 +0900 Subject: Remove allow_failures of php7.4 in Travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 889d0455b..43d85a4e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 jobs: allow_failures: - - php: 7.4 - php: nightly - php: hhvm-3.30 include: -- cgit v1.2.3-24-g4f1b From 40095dd11de792afe6c4bdba87c7d54076d6d6e3 Mon Sep 17 00:00:00 2001 From: sapics Date: Tue, 14 Apr 2020 00:42:31 +0900 Subject: Add composer cache in Travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 43d85a4e4..5070c24c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,10 @@ services: - mysql - postgresql +cache: + directories: + - $HOME/.composer/cache + before_script: - sh -c "composer install --no-progress" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" -- cgit v1.2.3-24-g4f1b