Skip to content

Commit

Permalink
Merge pull request #301 from scoutapp/fix-unconstrainted-laravel-igni…
Browse files Browse the repository at this point in the history
…tion-require

Fix an unconstrained CI require for spatie/laravel-ignition
  • Loading branch information
asgrim authored Feb 3, 2023
2 parents ea89ba3 + 16d2656 commit 3f6d72f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }}
steps:
- uses: actions/checkout@v3
- uses: Vampire/setup-wsl@v1
- uses: Vampire/setup-wsl@v2
if: ${{ matrix.os == 'windows-latest' }}
- name: "Install PHP"
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -405,7 +405,8 @@ jobs:
run: "composer require laravel/framework:${{ matrix.laravel-version}} --no-update --no-interaction --prefer-dist --prefer-stable"
- name: "Install spatie/laravel-ignition (if available)"
if: ${{ (matrix.php-version == '8.0' || matrix.php-version == '8.1') && (matrix.laravel-version == '8.*' || matrix.laravel-version == '9.*') }}
run: "composer require --dev spatie/laravel-ignition --no-update --no-interaction"
# Note: for Laravel 10, we will need to use `spatie/laravel-ignition:^2.0`
run: "composer require --dev spatie/laravel-ignition:^1.6 --no-update --no-interaction"
- name: "Unrestrict nesbot/carbon for older PHP versions"
if: ${{ (matrix.php-version == '7.2' || matrix.php-version == '7.3' || matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1') }}
run: "composer remove --dev --no-update --no-interaction nesbot/carbon"
Expand Down

0 comments on commit 3f6d72f

Please sign in to comment.