diff --git a/.gitattributes b/.gitattributes index ca9c9dab..f39ca25e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,4 @@ /.gitattributes export-ignore /.gitignore export-ignore /.php_cs export-ignore -/.travis.yml export-ignore /phpunit.xml.dist export-ignore -/phpunit.xml.travisci export-ignore diff --git a/.github/workflows/gh-actions.yml b/.github/workflows/tests.yml similarity index 72% rename from .github/workflows/gh-actions.yml rename to .github/workflows/tests.yml index e2d12bd0..762e0b04 100644 --- a/.github/workflows/gh-actions.yml +++ b/.github/workflows/tests.yml @@ -1,9 +1,8 @@ -# GitHub Action for Predis with PHP 7.2, 7.3, 7.4 & 8.0 & Redis 3, 4, 5 & 6 -name: Predis Builds +name: Tests on: [push, pull_request] jobs: predis: - name: Redis ${{ matrix.redis-versions }} (PHP ${{ matrix.php-versions }}) + name: PHP ${{ matrix.php-versions }} (Redis ${{ matrix.redis-versions }}) runs-on: ubuntu-latest services: redis: @@ -19,14 +18,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup PHP, with composer and extensions + - name: Setup PHP with Composer and extensions with: php-version: ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php - - name: Get composer cache directory + uses: shivammathur/setup-php@v2 + - name: Get Composer cache directory id: composercache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - name: Cache composer dependencies + - name: Cache Composer dependencies uses: actions/cache@v2 with: php-version: ${{ matrix.php-versions }} @@ -35,5 +34,5 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Install Composer dependencies run: composer install --no-progress --prefer-dist --optimize-autoloader - - name: Test with phpunit + - name: Test with PHPUnit run: vendor/bin/phpunit diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index beb94583..00000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: php -sudo: false -branches: - except: - - v0.5 - - v0.6 - - v0.6-PHP_5.2 - - documentation -before_install: - - docker run -d --rm -p 127.0.0.1:6379:6379 redis:${REDIS_VERSION:=3} -before_script: - - composer self-update - - composer install --no-interaction --prefer-source --dev -script: - - travis_retry vendor/bin/phpunit -c phpunit.xml.travisci -matrix: - fast_finish: true - include: - - php: 7.2 - - php: 7.3 - - php: 7.4 - env: REDIS_VERSION=4 # useless comment to trigger Travis - - php: 7.4 - env: REDIS_VERSION=5 - - php: 7.4 - env: REDIS_VERSION=6 - - php: nightly - allow_failures: - - php: nightly diff --git a/README.md b/README.md index 1b6946c8..7fa44c62 100644 --- a/README.md +++ b/README.md @@ -451,8 +451,8 @@ the `unstable` branch by modifying `phpunit.xml` and setting `REDIS_SERVER_VERSI the development server profile will be used. You can refer to [the tests README](tests/README.md) for more detailed information about testing Predis. -Predis uses Travis CI for continuous integration and the history for past and current builds can be -found [on its project page](http://travis-ci.org/predishq/predis). +Predis uses GitHub Actions for continuous integration and the history for past and current builds can be +found [on its actions page](https://github.com/predis/predis/actions). ## Other ## diff --git a/phpunit.xml.travisci b/phpunit.xml.travisci deleted file mode 100644 index 3bd2bf04..00000000 --- a/phpunit.xml.travisci +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - tests/Predis/ - - - - - - ext-phpiredis - ext-curl - realm-webdis - - - - - - - - - - src/ - - - - - - - - - - - - - - - - - - -