From 24dbbef3405540bce4b4165849787f6a5625663e Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Fri, 8 Jan 2021 14:39:02 +0100 Subject: [PATCH] Remove all references to travis --- .gitattributes | 2 -- .github/workflows/ci.yml | 4 ---- .travis.yml | 28 ---------------------------- CHANGELOG.md | 1 + README.md | 2 +- tests/Config.php | 2 +- travis.ini | 2 -- 7 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 .travis.yml delete mode 100644 travis.ini diff --git a/.gitattributes b/.gitattributes index f58d5806..29df9130 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,10 +11,8 @@ /.gitattributes export-ignore /.gitignore export-ignore -/.travis.yml export-ignore /error_reporting.ini export-ignore /make-release.sh export-ignore /phpunit.sh export-ignore /phpunit.xml export-ignore /TODO.md export-ignore -/travis.ini export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8c4d493..233c0810 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,5 @@ # https://help.github.com/en/categories/automating-your-workflow-with-github-actions -## TODO: -## - memcached/mysql services? -## - remove travis - on: - pull_request - push diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c41fda22..00000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: php -os: linux -dist: xenial - -install: - - travis_retry composer install - -jobs: - include: - - php: 7.2 - - php: 7.3 - - php: 7.4 - - php: 8.0 - install: travis_retry composer config platform.php 7.4.0 && composer install - fast_finish: true - -services: - - memcached - - mysql - -before_script: - - mysql -e "create database IF NOT EXISTS test;" -uroot - -before_install: - - phpenv config-rm xdebug.ini || return 0 - -script: - - ./phpunit.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b715b99..d44c1fec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed +- Switch CI from Travis to Github CI - Updated unit tests to avoid skipped and risky test warnings ### Removed diff --git a/README.md b/README.md index ee7edb1a..66e846e0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Smarty 3 template engine [smarty.net](https://www.smarty.net/) -[![Build Status](https://travis-ci.org/smarty-php/smarty.svg?branch=master)](https://travis-ci.org/smarty-php/smarty) +![CI](https://github.com/smarty-php/smarty/workflows/CI/badge.svg) ## Documentation diff --git a/tests/Config.php b/tests/Config.php index 57387dda..e2d66127 100644 --- a/tests/Config.php +++ b/tests/Config.php @@ -12,5 +12,5 @@ define('PdoCacheEnable', false); define('PdoGzipCacheEnable', false); define('MysqlResourceEnable', false); define('DB_DSN', "mysql:dbname=test;host=localhost"); -define('DB_USER', "travis"); +define('DB_USER', "root"); define('DB_PASSWD', ""); diff --git a/travis.ini b/travis.ini deleted file mode 100644 index 00b62452..00000000 --- a/travis.ini +++ /dev/null @@ -1,2 +0,0 @@ -extension = "memcache.so" -extension = "apc.so" \ No newline at end of file