Skip to content

Commit 969303a

Browse files
authoredMar 12, 2024
Merge pull request #163 from stevebauman/laravel-11
Laravel 11 compatibility
2 parents 72224a8 + bca89ad commit 969303a

File tree

2 files changed

+57
-51
lines changed

2 files changed

+57
-51
lines changed
 

‎.github/workflows/run-tests.yml

+52-47
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,57 @@
11
name: run-tests
22

33
on:
4-
push:
5-
pull_request:
6-
schedule:
7-
- cron: "0 0 * * *"
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: "0 0 * * *"
88

99
jobs:
10-
run-tests:
11-
runs-on: ubuntu-latest
12-
strategy:
13-
fail-fast: false
14-
matrix:
15-
php: [8.1, 8.2]
16-
laravel: [8.*, 9.*, 10.*]
17-
dependency-version: [prefer-stable]
18-
include:
19-
- laravel: 10.*
20-
testbench: 8.*
21-
- laravel: 9.*
22-
testbench: 7.*
23-
- laravel: 8.*
24-
testbench: 6.*
25-
26-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
27-
28-
steps:
29-
- name: Checkout code
30-
uses: actions/checkout@v2
31-
32-
- name: Cache dependencies
33-
uses: actions/cache@v2
34-
with:
35-
path: ~/.composer/cache/files
36-
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
37-
38-
- name: Setup PHP
39-
uses: shivammathur/setup-php@v2
40-
with:
41-
php-version: ${{ matrix.php }}
42-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, mysql, pdo_mysql, bcmath, intl, gd, exif, iconv
43-
coverage: none
44-
- name: Install dependencies
45-
run: |
46-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
47-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
48-
49-
- name: Execute tests
50-
run: vendor/bin/pest
51-
env:
52-
MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
10+
run-tests:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
os: [ ubuntu-latest ]
16+
php: [ 8.3, 8.2, 8.1 ]
17+
laravel: [ 11.*, 10.*, 9.* ]
18+
dependency-version: [ prefer-stable ]
19+
include:
20+
- laravel: 11.*
21+
testbench: 9.*
22+
- laravel: 10.*
23+
testbench: 8.*
24+
- laravel: 9.*
25+
testbench: 7.*
26+
exclude:
27+
- laravel: 11.*
28+
php: 8.1
29+
- laravel: 9.*
30+
php: 8.3
31+
32+
name: ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
33+
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v4
37+
38+
- name: Cache dependencies
39+
uses: actions/cache@v4
40+
with:
41+
path: ~/.composer/cache/files
42+
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
43+
44+
- name: Setup PHP
45+
uses: shivammathur/setup-php@v2
46+
with:
47+
php-version: ${{ matrix.php }}
48+
49+
- name: Install dependencies
50+
run: |
51+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
52+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
53+
54+
- name: Execute tests
55+
run: vendor/bin/pest
56+
env:
57+
MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}

‎composer.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222
"ext-json": "*",
2323
"ext-curl": "*",
2424
"geoip2/geoip2": "^2.0",
25-
"illuminate/support": "^8.0|^9.0|^10.0"
25+
"illuminate/support": "^8.0|^9.0|^10.0|^11.0"
2626
},
2727
"require-dev": {
28-
"pestphp/pest": "^1.21",
28+
"pestphp/pest": "^1.0|^2.0",
2929
"mockery/mockery": "^1.0",
30-
"orchestra/testbench": "^6.0|^7.0|^8.0"
30+
"orchestra/testbench": "^6.0|^7.0|^8.0|^9.0"
3131
},
32+
"minimum-stability": "dev",
33+
"prefer-stable": true,
3234
"archive": {
3335
"exclude": [
3436
"/tests"
@@ -44,7 +46,6 @@
4446
"Stevebauman\\Location\\Tests\\": "tests/"
4547
}
4648
},
47-
"minimum-stability": "stable",
4849
"extra": {
4950
"laravel": {
5051
"providers": [

0 commit comments

Comments
 (0)