Skip to content

Commit 716acb2

Browse files
authored
Merge pull request #123 from cloudinary-community/develop
Bring up to date with Laravel 11
2 parents 47701de + 83f7fbe commit 716acb2

24 files changed

+1229
-8917
lines changed

.github/workflows/tests.yaml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,43 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
strategy:
14-
fail-fast: true
14+
fail-fast: false
1515
matrix:
16-
php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
17-
18-
name: PHP ${{ matrix.php }}
16+
php: [8.1, 8.2, 8.3]
17+
laravel: [10.*, 11.*]
18+
include:
19+
- laravel: 10.*
20+
testbench: 8.*
21+
- laravel: 11.*
22+
testbench: 9.*
23+
exclude:
24+
- laravel: 11.*
25+
php: 8.1
26+
27+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Testbench ${{ matrix.testbench }}
1928

2029
steps:
2130
- name: Checkout code
2231
uses: actions/checkout@v2
2332

33+
- name: Cache dependencies
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/.composer/cache/files
37+
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
38+
2439
- name: Setup PHP
2540
uses: shivammathur/setup-php@v2
2641
with:
2742
php-version: ${{ matrix.php }}
28-
extensions: sqlite, pdo_sqlite
43+
extensions: mbstring, pdo, pdo_sqlite
2944
tools: composer:v2
3045
coverage: none
3146

3247
- name: Install dependencies
33-
# TODO: remove --ignore-platform-reqs when we have stable v2 release
34-
run: composer install --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs
48+
run: |
49+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
50+
composer update --prefer-stable --prefer-dist --no-interaction --with-all-dependencies
3551
3652
- name: Execute tests
37-
run: vendor/bin/pest
53+
run: vendor/bin/pest --ci

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
/.idea/
2+
/.phpunit.cache
13
/node_modules
24
/public/hot
35
/public/storage
46
/storage/*.key
57
/vendor
68
.env
79
.env.backup
8-
.phpunit.result.cache
910
Homestead.json
1011
Homestead.yaml
1112
npm-debug.log
1213
yarn-error.log
1314
src/.php_cs.cache
14-
.idea/

0 commit comments

Comments
 (0)