From f8933e433796db39555860fb0f704a9822572154 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Tue, 14 Apr 2020 18:06:24 +0100 Subject: [PATCH 1/3] Switched to actions --- .gitattributes | 1 - .github/workflows/tests.yml | 50 ++++++++++++ .travis.yml | 151 ------------------------------------ README.md | 12 +-- 4 files changed, 56 insertions(+), 158 deletions(-) create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml diff --git a/.gitattributes b/.gitattributes index 26873e9..337ff0a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes export-ignore /.github export-ignore /.gitignore export-ignore -/.travis.yml export-ignore /phpunit.xml.dist export-ignore /CHANGELOG.md export-ignore /README.md export-ignore diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..1f1fcdd --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,50 @@ +name: Tests + +on: + push: + pull_request: + schedule: + - cron: '0 4 * * 1' + +jobs: + test: + + runs-on: ubuntu-latest + + strategy: + matrix: + php: [7.1, 7.2, 7.3, 7.4] + laravel: [5.5, 5.6, 5.7, 5.8, 6, 7] + exclude: + - php: 7.1 + laravel: 6 + - php: 7.1 + laravel: 7 + + name: PHP ${{ matrix.php }}; Laravel ${{ matrix.laravel }} + + steps: + - uses: actions/checkout@v2 + - name: Pull Docker Image + run: docker pull registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} + - name: Select Laravel 5.5 + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} require "laravel/framework:5.5.*" "phpunit/phpunit:^6.5" --no-update -n + if: "matrix.laravel == 5.5" + - name: Select Laravel 5.6 + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} require "laravel/framework:5.6.*" "phpunit/phpunit:^7.5" --no-update -n + if: "matrix.laravel == 5.6" + - name: Select Laravel 5.7 + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} require "laravel/framework:5.7.*" "phpunit/phpunit:^7.5" --no-update -n + if: "matrix.laravel == 5.7" + - name: Select Laravel 5.8 + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} require "laravel/framework:${{ matrix.laravel }}.*" "phpunit/phpunit:^7.5|^8.5" --no-update -n + if: "matrix.laravel == 5.8" + - name: Select Laravel 6/7 + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} require "laravel/framework:${{ matrix.laravel }}.*" "phpunit/phpunit:^8.5|^9.0" --no-update -n + if: "matrix.laravel >= 6" + - name: Run Composer + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} install --prefer-dist -n -o + - name: Run PHPUnit + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} --coverage-clover build/logs/clover.xml + - name: Upload Coverage + run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint ocular registry.gitlab.com/grahamcampbell/php:${{ matrix.php }} code-coverage:upload --format=php-clover build/logs/clover.xml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 086a2a1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,151 +0,0 @@ -dist: bionic - -matrix: - include: - - name: PHP 7.1; Laravel 5.5 - env: - - PHP_VERSION=7.1 - - LARAVEL_VERSION=5.5.* - - SYMFONY_VERSION=^3.0 - - PHPUNIT_VERSION=^6.5 - - name: PHP 7.1; Laravel 5.6 - env: - - PHP_VERSION=7.1 - - LARAVEL_VERSION=5.6.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.1; Laravel 5.7 - env: - - PHP_VERSION=7.1 - - LARAVEL_VERSION=5.7.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.1; Laravel 5.8 - env: - - PHP_VERSION=7.1 - - LARAVEL_VERSION=5.8.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.2; Laravel 5.5 - env: - - PHP_VERSION=7.2 - - LARAVEL_VERSION=5.5.* - - SYMFONY_VERSION=^3.0 - - PHPUNIT_VERSION=^6.5 - - name: PHP 7.2; Laravel 5.6 - env: - - PHP_VERSION=7.2 - - LARAVEL_VERSION=5.6.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.2; Laravel 5.7 - env: - - PHP_VERSION=7.2 - - LARAVEL_VERSION=5.7.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.2; Laravel 5.8 - env: - - PHP_VERSION=7.2 - - LARAVEL_VERSION=5.8.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.2; Laravel 6 - env: - - PHP_VERSION=7.2 - - LARAVEL_VERSION=^6.0 - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.2; Laravel 7 - env: - - PHP_VERSION=7.2 - - LARAVEL_VERSION=^7.0 - - SYMFONY_VERSION=^5.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.3; Laravel 5.5 - env: - - PHP_VERSION=7.3 - - LARAVEL_VERSION=5.5.* - - SYMFONY_VERSION=^3.0 - - PHPUNIT_VERSION=^6.5 - - name: PHP 7.3; Laravel 5.6 - env: - - PHP_VERSION=7.3 - - LARAVEL_VERSION=5.6.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.3; Laravel 5.7 - env: - - PHP_VERSION=7.3 - - LARAVEL_VERSION=5.7.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.3; Laravel 5.8 - env: - - PHP_VERSION=7.3 - - LARAVEL_VERSION=5.8.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.3; Laravel 6 - env: - - PHP_VERSION=7.3 - - LARAVEL_VERSION=^6.0 - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.3; Laravel 7 - env: - - PHP_VERSION=7.3 - - LARAVEL_VERSION=^7.0 - - SYMFONY_VERSION=^5.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.4; Laravel 5.5 - env: - - PHP_VERSION=7.4 - - LARAVEL_VERSION=5.5.* - - SYMFONY_VERSION=^3.0 - - PHPUNIT_VERSION=^6.5 - - name: PHP 7.4; Laravel 5.6 - env: - - PHP_VERSION=7.4 - - LARAVEL_VERSION=5.6.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.4; Laravel 5.7 - env: - - PHP_VERSION=7.4 - - LARAVEL_VERSION=5.7.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^7.5 - - name: PHP 7.4; Laravel 5.8 - env: - - PHP_VERSION=7.4 - - LARAVEL_VERSION=5.8.* - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.4; Laravel 6 - env: - - PHP_VERSION=7.4 - - LARAVEL_VERSION=^6.0 - - SYMFONY_VERSION=^4.0 - - PHPUNIT_VERSION=^8.0 - - name: PHP 7.4; Laravel 7 - env: - - PHP_VERSION=7.4 - - LARAVEL_VERSION=^7.0 - - SYMFONY_VERSION=^5.0 - - PHPUNIT_VERSION=^8.0 - -before_install: - - travis_retry docker pull registry.gitlab.com/grahamcampbell/php:$PHP_VERSION - - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "laravel/framework:${LARAVEL_VERSION}" --no-update -n - - if [ "$SYMFONY_VERSION" != "^5.0" ]; then docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "symfony/lts:${SYMFONY_VERSION}" --no-update -n; fi - - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update -n - -install: - - travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION install --no-suggest --prefer-dist -n -o - -script: - - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:$PHP_VERSION --coverage-clover build/logs/clover.xml - -after_script: - - travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint ocular registry.gitlab.com/grahamcampbell/php:$PHP_VERSION code-coverage:upload --format=php-clover build/logs/clover.xml diff --git a/README.md b/README.md index 092190f..0476e46 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Laravel DigitalOcean was created by, and is maintained by [Graham Campbell](http ![Banner](https://user-images.githubusercontent.com/2829600/71477345-60993680-27e1-11ea-9161-d2c91c65f77a.png)

-StyleCI Status -Build Status -Coverage Status -Quality Score -Software License -Latest Version +StyleCI Status +Build Status +Coverage Status +Quality Score +Software License +Latest Version

From 8ad1d6d109742f666e4ce2257b4aa85f65e501ed Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Tue, 14 Apr 2020 18:09:17 +0100 Subject: [PATCH 2/3] Updated funding information --- .github/FUNDING.yml | 2 +- README.md | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index ee311fb..be8194f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ -patreon: GrahamJCampbell +github: GrahamCampbell tidelift: "packagist/graham-campbell/digitalocean" diff --git a/README.md b/README.md index 0476e46..7c4a0fc 100644 --- a/README.md +++ b/README.md @@ -174,14 +174,8 @@ If you discover a security vulnerability within this package, please send an ema Laravel DigitalOcean is licensed under [The MIT License (MIT)](LICENSE). ---- - -
- - Get professional support for Laravel DigitalOcean with a Tidelift subscription - -
- - Tidelift helps make open source sustainable for maintainers while giving companies
assurances about security, maintenance, and licensing for their dependencies. - -
+## For Enterprise + +Available as part of the Tidelift Subscription + +The maintainers of `graham-campbell/digitalocean` and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-graham-campbell-digitalocean?utm_source=packagist-graham-campbell-digitalocean&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) From b7212d4f228c07663d4b8cf12a052b0122c9b6bc Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Tue, 14 Apr 2020 18:11:42 +0100 Subject: [PATCH 3/3] Release 5.4.1 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 566b1d3..cb6d5f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ CHANGE LOG ========== +## V5.4.1 (14/04/2020) + +* Updated funding information + + ## V5.4 (25/01/2020) * Added Laravel 7 support