Skip to content

Commit a7cf935

Browse files
committed
Merge branch 'release/v1.2.0'
2 parents e6e0f7a + 93ab900 commit a7cf935

File tree

3 files changed

+60
-13
lines changed

3 files changed

+60
-13
lines changed

.github/workflows/test.yml

+45-8
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,62 @@ on:
88

99
jobs:
1010
test:
11-
name: Test
12-
13-
runs-on: ubuntu-latest
14-
11+
runs-on: ${{ matrix.os }}
1512
strategy:
13+
fail-fast: false
1614
matrix:
17-
php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
15+
os: [ ubuntu-latest ]
16+
php: [ 7.2, 7.3, 7.4, 8.0, 8.1, 8.2 ]
17+
laravel: [ 6, 7, 8, 9, 10 ]
18+
exclude:
19+
- php: 7.2
20+
laravel: 8
21+
- php: 7.2
22+
laravel: 9
23+
- php: 7.2
24+
laravel: 10
25+
- php: 7.3
26+
laravel: 9
27+
- php: 7.3
28+
laravel: 10
29+
- php: 7.4
30+
laravel: 9
31+
- php: 7.4
32+
laravel: 10
33+
- php: '8.0'
34+
laravel: 10
35+
- php: 8.1
36+
laravel: 6
37+
- php: 8.1
38+
laravel: 7
39+
- php: 8.2
40+
laravel: 6
41+
- php: 8.2
42+
laravel: 7
43+
- php: 8.2
44+
laravel: 8
45+
46+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
1847

1948
steps:
20-
- name: Setup PHP ${{ matrix.php-version }}
49+
- name: Setup PHP ${{ matrix.php }}
2150
uses: shivammathur/setup-php@v2
2251
with:
23-
php-version: ${{ matrix.php-version }}
52+
php-version: ${{ matrix.php }}
53+
ini-values: error_reporting=E_ALL
54+
tools: composer:v2
2455

2556
- name: Checkout
2657
uses: actions/checkout@v3
2758

2859
- name: Install dependencies
29-
run: composer install --quiet --no-ansi --prefer-dist --no-progress --no-interaction
60+
run: |
61+
composer require "illuminate/support=^${{ matrix.laravel }}" --no-update
62+
composer update --prefer-dist --no-interaction --no-progress
63+
64+
- name: Migrate phpunit XML configuration
65+
continue-on-error: true
66+
run: vendor/bin/phpunit --migrate-configuration
3067

3168
- name: Run test suite
3269
run: vendor/bin/phpunit --coverage-clover=coverage.xml

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Add AWS_SESSION_TOKEN for Laravel 6, 7, 8 and 9
1+
# Add AWS_SESSION_TOKEN for Laravel 6, 7, 8, 9 and 10
22

33
[![Latest](https://poser.pugx.org/sunaoka/laravel-aws-session-token/v)](https://packagist.org/packages/sunaoka/laravel-aws-session-token)
44
[![License](https://poser.pugx.org/sunaoka/laravel-aws-session-token/license)](https://packagist.org/packages/sunaoka/laravel-aws-session-token)
55
[![PHP](https://img.shields.io/packagist/php-v/sunaoka/laravel-aws-session-token)](composer.json)
6-
[![Laravel](https://img.shields.io/badge/laravel-6.x%20%7C%207.x%20%7C%208.x%20%7C%209.x-red)](https://laravel.com/)
6+
[![Laravel](https://img.shields.io/badge/laravel-6.x%20%7C%207.x%20%7C%208.x%20%7C%209.x%20%7C%2010.x-red)](https://laravel.com/)
77
[![Test](https://github.com/sunaoka/laravel-aws-session-token/actions/workflows/test.yml/badge.svg)](https://github.com/sunaoka/laravel-aws-session-token/actions/workflows/test.yml)
88
[![codecov](https://codecov.io/gh/sunaoka/laravel-aws-session-token/branch/develop/graph/badge.svg)](https://codecov.io/gh/sunaoka/laravel-aws-session-token)
99

composer.json

+13-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
],
1313
"require": {
1414
"php": "^7.2 || ^8.0",
15-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0"
15+
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
1616
},
1717
"require-dev": {
18-
"orchestra/testbench": ">=4.0"
18+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
1919
},
2020
"autoload": {
2121
"psr-4": {
@@ -28,12 +28,22 @@
2828
}
2929
},
3030
"extra": {
31+
"branch-alias": {
32+
"dev-main": "1.x-dev"
33+
},
3134
"laravel": {
3235
"providers": [
3336
"Sunaoka\\LaravelAwsSessionToken\\AwsSessionTokenServiceProvider"
3437
],
3538
"aliases": {
3639
}
3740
}
38-
}
41+
},
42+
"config": {
43+
"optimize-autoloader": true,
44+
"preferred-install": "dist",
45+
"sort-packages": true
46+
},
47+
"minimum-stability": "dev",
48+
"prefer-stable": true
3949
}

0 commit comments

Comments
 (0)