Skip to content

Commit d7aceba

Browse files
authored
Merge pull request #10 from gwleuverink/bump/laravel-11
Bump/laravel 11
2 parents bf38f2d + 5debb38 commit d7aceba

File tree

9 files changed

+736
-656
lines changed

9 files changed

+736
-656
lines changed

.github/workflows/browser-tests.yml

+26-5
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,56 @@ on:
88
types: [completed]
99

1010
jobs:
11+
skip-duplicates:
12+
continue-on-error: true # Uncomment once integration is finished
13+
runs-on: ubuntu-latest
14+
15+
outputs:
16+
should_skip: ${{ steps.skip_check.outputs.should_skip }}
17+
18+
steps:
19+
- id: skip_check
20+
uses: fkirc/skip-duplicate-actions@v5
21+
with:
22+
cancel_others: "true"
23+
concurrent_skipping: "same_content"
24+
skip_after_successful_duplicate: "true"
25+
paths_ignore: '["**/README.md", "**/docs/**"]'
26+
1127
browser-tests:
1228
runs-on: ubuntu-latest
1329

30+
strategy:
31+
fail-fast: true
32+
matrix:
33+
php: [8.2, 8.3]
34+
laravel: [^10, ^11]
35+
dependency-version: [prefer-lowest, prefer-stable]
36+
1437
steps:
1538
- name: Checkout repository
1639
uses: actions/checkout@v4
1740

1841
- name: Setup PHP
1942
uses: shivammathur/setup-php@v2
2043
with:
21-
php-version: "8.2"
44+
php-version: ${{ matrix.php }}
2245
extensions: zip
23-
coverage: xdebug
24-
2546
- name: Get Composer Cache Directory
2647
id: composer-cache
2748
run: |
2849
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
2950
3051
- name: Restore Composer Cache
31-
uses: actions/cache@v3
52+
uses: actions/cache@v4
3253
with:
3354
path: ${{ steps.composer-cache.outputs.dir }}
3455
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
3556
restore-keys: |
3657
${{ runner.os }}-composer-
3758
3859
- name: Install Composer dependecies
39-
run: composer install --no-progress --prefer-dist --optimize-autoloader
60+
run: composer update --no-progress --optimize-autoloader --${{ matrix.dependency-version }}
4061

4162
- name: Directory Permissions
4263
run: sudo chown -R $(whoami) vendor/pestphp/pest/.temp vendor/orchestra

.github/workflows/tests.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ jobs:
1212
continue-on-error: true # Uncomment once integration is finished
1313
runs-on: ubuntu-latest
1414

15-
# Map a step output to a job output
1615
outputs:
1716
should_skip: ${{ steps.skip_check.outputs.should_skip }}
1817

1918
steps:
2019
- id: skip_check
2120
uses: fkirc/skip-duplicate-actions@v5
2221
with:
23-
# All of these options are optional, so you can remove them if you are happy with the defaults
2422
cancel_others: "true"
2523
concurrent_skipping: "same_content"
2624
skip_after_successful_duplicate: "true"
@@ -32,14 +30,21 @@ jobs:
3230

3331
runs-on: ubuntu-latest
3432

33+
strategy:
34+
fail-fast: true
35+
matrix:
36+
php: [8.2, 8.3]
37+
laravel: [^10, ^11]
38+
dependency-version: [prefer-lowest, prefer-stable]
39+
3540
steps:
3641
- name: Checkout repository
3742
uses: actions/checkout@v4
3843

3944
- name: Setup PHP
4045
uses: shivammathur/setup-php@v2
4146
with:
42-
php-version: "8.2"
47+
php-version: ${{ matrix.php }}
4348
extensions: zip
4449
coverage: xdebug
4550

@@ -49,15 +54,15 @@ jobs:
4954
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
5055
5156
- name: Restore Composer Cache
52-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5358
with:
5459
path: ${{ steps.composer-cache.outputs.dir }}
5560
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
5661
restore-keys: |
5762
${{ runner.os }}-composer-
5863
5964
- name: Install Composer dependecies
60-
run: composer install --no-progress --prefer-dist --optimize-autoloader
65+
run: composer update --no-progress --optimize-autoloader --${{ matrix.dependency-version }}
6166

6267
- name: Directory Permissions
6368
run: sudo chown -R $(whoami) vendor/pestphp/pest/.temp vendor/orchestra

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"minimum-stability": "stable",
3232
"require": {
33-
"php": "^8.0",
34-
"illuminate/contracts": "^10",
35-
"illuminate/support": "^10"
33+
"php": "^8.1",
34+
"illuminate/contracts": "^10|^11",
35+
"illuminate/support": "^10|^11"
3636
},
3737
"require-dev": {
3838
"friendsofphp/php-cs-fixer": "^3.30",
@@ -44,8 +44,8 @@
4444
"pestphp/pest": "^2.30",
4545
"spatie/laravel-ignition": "^2.3",
4646
"symfony/thanks": "^1.2",
47-
"orchestra/testbench": "^8.19",
48-
"orchestra/testbench-dusk": "^8.19",
47+
"orchestra/testbench": "^8",
48+
"orchestra/testbench-dusk": "^8",
4949
"livewire/livewire": "^3.4"
5050
},
5151
"config": {

0 commit comments

Comments
 (0)