Skip to content

Commit

Permalink
Update composer.json
Browse files Browse the repository at this point in the history
bump php version to match nunomaduro/larastan

Revert "Update composer.json"

This reverts commit 078df73.

Update Github Actions

Update checks.yml

Update checks.yml

Update checks.yml
  • Loading branch information
usernotnull committed Feb 9, 2022
1 parent f05a190 commit 5bf4168
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 23 deletions.
32 changes: 15 additions & 17 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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/[email protected]
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 }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/styling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ 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

- 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

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5bf4168

Please sign in to comment.