From 6eafb67e18c6b0e01f846d73f3f2b3a6afff9c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rube=CC=81n=20Robles?= Date: Fri, 24 May 2024 13:40:04 +0200 Subject: [PATCH] add Laravel 11 support --- .github/workflows/tests.yml | 64 ++++++++++++++++++++++--------------- composer.json | 12 +++---- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c61292f..7e2de34 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,6 +1,6 @@ name: tests -on: [ push, pull_request ] +on: [push, pull_request] jobs: test: @@ -9,13 +9,10 @@ jobs: strategy: fail-fast: true matrix: - os: [ ubuntu-latest ] - php: [8.0, 8.1, 8.2] - laravel: [ 9.*, 10.* ] - dependency-version: [ prefer-stable ] - exclude: - - laravel: 10.* - php: 8.0 + os: [ubuntu-latest] + php: [8.0, 8.1, 8.2, 8.3] + stability: [prefer-stable] + laravel: [9.*, 10.*, 11.*] include: - laravel: 9.* testbench: 7.* @@ -23,41 +20,56 @@ jobs: - laravel: 10.* testbench: 8.* - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + - laravel: 11.* + testbench: 9.* + exclude: + - php: 8.0 + laravel: 10.* + + - php: 8.0 + laravel: 11.* + + - php: 8.1 + laravel: 11.* + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - - name: Checkout code - uses: actions/checkout@v3 + - name: ๐Ÿ— Checkout code + uses: actions/checkout@v4 + + - name: ๐Ÿ— Setup Meilisearch + run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key="1234" --no-analytics - - name: Setup PHP + - name: ๐Ÿ— Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, intl, exif coverage: pcov - - name: Get composer cache directory + - name: ๐Ÿ— Get composer cache directory id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - name: Cache dependencies - uses: actions/cache@v3 + - name: ๐Ÿ— Cache dependencies + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.dependency-version }}- + key: dependencies-composer-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.lock') }} + restore-keys: dependencies-composer-laravel-${{ matrix.laravel }}- - - name: Install dependencies + - name: ๐Ÿ“ฆ Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} - - name: Execute tests + - name: ๐Ÿงช Execute tests run: vendor/bin/phpunit -c phpunit.coverage.dist.xml - - name: Deploy coverage to codacy - uses: codacy/codacy-coverage-reporter-action@v1 + - name: ๐Ÿš€ Upload coverage reports to Codecov + uses: codecov/codecov-action@v4 with: - # project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} - api-token: ${{ secrets.CODACY_API_TOKEN }} - coverage-reports: clover.xml + token: ${{ secrets.CODECOV_TOKEN }} + files: ./clover.xml + fail_ci_if_error: true + # verbose: true diff --git a/composer.json b/composer.json index ce249ca..e2d4deb 100644 --- a/composer.json +++ b/composer.json @@ -9,15 +9,15 @@ } ], "require": { - "php": "^8.0|^8.1|^8.2", - "illuminate/database": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0" + "php": "^8.0", + "illuminate/database": "^9.0 || ^10.0 || ^11.0", + "illuminate/support": "^9.0 || ^10.0 || ^11.0" }, "require-dev": { - "orchestra/testbench": "^7.0|^8.0", - "nunomaduro/larastan": "^2.0", + "larastan/larastan": "^2.0", + "orchestra/testbench": "^7.0 || ^8.0 || ^9.0", "phpstan/phpstan": "^1.0", - "phpunit/phpunit": "^9.0|^10.0" + "phpunit/phpunit": "^9.0 || ^10.0" }, "autoload": { "psr-4": {