Skip to content

Commit 592324f

Browse files
Codegenio238
andcommitted
fix: update GitHub Actions workflow and dependencies
- Align GitHub Actions workflow with spatie/package-skeleton-laravel - Make this a breaking change (v2.0.0) by dropping support for Laravel <10 - Update dependencies to support Laravel 10, 11, and 12 - Fix test matrix to only include compatible PHP and Laravel versions - Add concurrency control and timeout limits to GitHub Actions workflow Co-authored-by: Martin <[email protected]>
1 parent bcd9a4c commit 592324f

File tree

2 files changed

+44
-19
lines changed

2 files changed

+44
-19
lines changed

.github/workflows/run-tests.yml

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,48 @@
11
name: Tests
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
paths:
6+
- '**.php'
7+
- '.github/workflows/run-tests.yml'
8+
- 'phpunit.xml.dist'
9+
- 'composer.json'
10+
- 'composer.lock'
11+
pull_request:
12+
paths:
13+
- '**.php'
14+
- '.github/workflows/run-tests.yml'
15+
- 'phpunit.xml.dist'
16+
- 'composer.json'
17+
- 'composer.lock'
18+
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
422

523
jobs:
624
test:
725
runs-on: ${{ matrix.os }}
26+
timeout-minutes: 5
827
strategy:
9-
fail-fast: false
28+
fail-fast: true
1029
matrix:
11-
os: [ ubuntu-latest, windows-latest ]
12-
php: [ 8.3, 8.2, 8.1 ]
13-
laravel: [ 12.*, 11.*, 10.*, 9.*, 8.* ]
14-
stability: [ prefer-stable ]
30+
os: [ubuntu-latest, windows-latest]
31+
php: [8.3, 8.2, 8.1]
32+
laravel: [12.*, 11.*, 10.*]
33+
stability: [prefer-stable]
1534
include:
1635
- laravel: 12.*
1736
testbench: 10.*
37+
php: 8.3
38+
- laravel: 11.*
39+
testbench: 9.*
40+
php: 8.3
1841
- laravel: 11.*
1942
testbench: 9.*
43+
php: 8.2
2044
- laravel: 10.*
21-
testbench: 8.*
22-
- laravel: 9.*
23-
testbench: 7.*
24-
- laravel: 8.*
25-
testbench: 6.*
45+
testbench: ^8.22
2646
exclude:
2747
- laravel: 12.*
2848
php: 8.2
@@ -35,7 +55,7 @@ jobs:
3555

3656
steps:
3757
- name: Checkout code
38-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
3959

4060
- name: Setup PHP
4161
uses: shivammathur/setup-php@v2
@@ -54,5 +74,9 @@ jobs:
5474
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5575
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5676
77+
- name: List Installed Dependencies
78+
run: composer show -D
79+
5780
- name: Execute tests
58-
run: vendor/bin/pest
81+
run: vendor/bin/pest --ci
82+

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "io238/laravel-iso-countries",
3-
"version": "1.3.0",
3+
"version": "2.0.0",
44
"description": "Ready-to-use Laravel models and relations for country (ISO 3166), language (ISO 639-1), and currency (ISO 4217) information with multi-language support.",
55
"keywords": [
66
"laravel",
@@ -31,18 +31,18 @@
3131
],
3232
"require": {
3333
"php": "^8.1",
34-
"illuminate/contracts": "^7.0|^8.40|^9.0|^10.0|^11.0|^12.0",
35-
"illuminate/database": "^7.0|^8.40|^9.0|^10.0|^11.0|^12.0",
36-
"illuminate/support": "^7.0|^8.40|^9.0|^10.0|^11.0|^12.0",
37-
"spatie/laravel-translatable": "^4.6|^5.0|^6.0",
34+
"illuminate/contracts": "^10.0|^11.0|^12.0",
35+
"illuminate/database": "^10.0|^11.0|^12.0",
36+
"illuminate/support": "^10.0|^11.0|^12.0",
37+
"spatie/laravel-translatable": "^6.0",
3838
"slowprog/composer-copy-file": "^0.3",
3939
"components/flag-icon-css": "^3.5.0",
4040
"umpirsky/country-list": "^2.0.6",
4141
"umpirsky/language-list": "^v1.1",
4242
"umpirsky/currency-list": "^v1.1.1"
4343
},
4444
"require-dev": {
45-
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
45+
"orchestra/testbench": "^8.22|^9.0|^10.0",
4646
"pestphp/pest": "^2.0"
4747
},
4848
"autoload": {
@@ -86,3 +86,4 @@
8686
"minimum-stability": "dev",
8787
"prefer-stable": true
8888
}
89+

0 commit comments

Comments
 (0)