From 62481c9bd72a1afb643e0119363e1ce689ef2fbe Mon Sep 17 00:00:00 2001 From: Ilesanmi Olawale Adedotun Date: Sun, 10 Jul 2022 17:58:21 +0100 Subject: [PATCH 1/2] chore: improved tests and dependencies --- .github/workflows/tests.yml | 27 +++++++++++++++++---------- composer.json | 4 ++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 983e032..ff3a12a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,15 +11,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: - - "7.3" - - "7.4" - - "8.0" - dependency-version: - # - prefer-lowest - - prefer-stable + php: [7.3, 7.4, '8.0', 8.1] + laravel: [6, 7, 8, 9] + exclude: + - php: 7.3 + laravel: 9 + - php: 7.4 + laravel: 9 + - php: 8.1 + laravel: 6 + - php: 8.1 + laravel: 7 + + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }} tests steps: # basically git clone - uses: actions/checkout@v2 @@ -36,10 +41,12 @@ jobs: with: php-version: ${{ matrix.php }} coverage: none # disable xdebug, pcov - tools: composer + ini-values: error_reporting=E_ALL + tools: composer:v2 - name: Install Composer Dependencies run: | - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update + composer update --prefer-dist --no-interaction --no-progress - name: Run PHPUnit Tests run: composer test \ No newline at end of file diff --git a/composer.json b/composer.json index 67c7e90..0f26c0a 100755 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "require": { "php": "^7.2|^8.0", "mane-olawale/termii": "^1.2", - "illuminate/notifications": "^6.0|^7.0|^8.0", - "illuminate/support": "^6.0|^7.0|^8.0" + "illuminate/notifications": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0" }, "require-dev": { "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0", From e60ea26340c376a657952873cdc4c3ff96a29627 Mon Sep 17 00:00:00 2001 From: Ilesanmi Olawale Adedotun Date: Sun, 10 Jul 2022 18:05:24 +0100 Subject: [PATCH 2/2] chore: setup php v2 --- .github/workflows/tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ff3a12a..f1429af 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: tests: @@ -37,9 +37,10 @@ jobs: git --version - name: Setup PHP # use PHP of specific version - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip coverage: none # disable xdebug, pcov ini-values: error_reporting=E_ALL tools: composer:v2