diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index fbe7580..df8dffa 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -14,15 +14,13 @@ jobs: strategy: fail-fast: true matrix: - os: [ ubuntu-latest ] #, windows-latest - php: [ 8.0 ] - laravel: [ 8.*, 9.* ] - stability: [ prefer-lowest ] #, prefer-stable + os: [ ubuntu-latest ] + php: [ 8.1 ] + laravel: [ 9.* ] + dependency-version: [ prefer-lowest ] include: - - laravel: 8.* - testbench: 6.* - laravel: 9.* - testbench: 7.* + testbench: ^7.0 steps: - name: Checkout Code uses: actions/checkout@v2 @@ -49,7 +47,7 @@ jobs: - name: Install Composer dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev - composer update --${{ matrix.stability }} --prefer-dist --no-interaction + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Psalm run: ./vendor/bin/psalm --output-format=github @@ -70,14 +68,14 @@ jobs: strategy: fail-fast: true matrix: - os: [ ubuntu-latest ] # windows-latest - php: [ 8.0 ] - laravel: [ 8.* ] - stability: [ prefer-lowest, prefer-stable ] + os: [ ubuntu-latest ] + php: [ 8.1 ] + laravel: [ 9.* ] + dependency-version: [ prefer-stable ] include: - - laravel: 8.* + - laravel: 9.* - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} steps: - name: Checkout Code @@ -105,7 +103,7 @@ jobs: - name: Install Composer dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update --dev - composer update --${{ matrix.stability }} --prefer-dist --no-interaction + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Setup Problem Matchers run: | @@ -125,14 +123,14 @@ jobs: RUNNING_IN_CI: true - name: Upload Coverage - if: github.ref == 'refs/heads/main' && matrix.php == '8.0' && matrix.laravel == '8.*' && matrix.os == 'ubuntu-latest' && matrix.stability == 'prefer-stable' + if: github.ref == 'refs/heads/main' && matrix.php == '8.0' && matrix.laravel == '8.*' && matrix.os == 'ubuntu-latest' && matrix.dependency-version == 'prefer-stable' uses: codacy/codacy-coverage-reporter-action@v1.3 with: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} coverage-reports: build/clover.xml - name: Upload coverage to Codecov - if: github.ref == 'refs/heads/main' && matrix.php == '8.0' && matrix.laravel == '8.*' && matrix.os == 'ubuntu-latest' && matrix.stability == 'prefer-stable' + if: github.ref == 'refs/heads/main' && matrix.php == '8.0' && matrix.laravel == '8.*' && matrix.os == 'ubuntu-latest' && matrix.dependency-version == 'prefer-stable' uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/styling.yml b/.github/workflows/styling.yml index e21bee6..e56cc0c 100644 --- a/.github/workflows/styling.yml +++ b/.github/workflows/styling.yml @@ -15,11 +15,11 @@ jobs: matrix: os: [ ubuntu-latest ] #, windows-latest php: [ 8.0 ] - laravel: [ 8.* ] - stability: [ prefer-lowest ] #, prefer-stable + laravel: [ 9.* ] + dependency-version: [ prefer-lowest ] #, prefer-stable include: - - laravel: 8.* - testbench: ^6.6 + - laravel: 9.* + testbench: ^7.0 steps: - name: Checkout Code uses: actions/checkout@v2 @@ -27,7 +27,7 @@ jobs: - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' tools: composer:v2 coverage: false diff --git a/composer.json b/composer.json index cc67a17..2985882 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ } ], "require": { - "php": "^8.0", + "php": "^8.0.2", "illuminate/contracts": "^v8.61|^9.0", "livewire/livewire": "^v2.10", "spatie/laravel-package-tools": "^1.11"