Skip to content

Commit 51f998a

Browse files
lrljoelrljoe
authored
Merge pull request rappasoft#2108 from LowerRockLabs/WorkflowCacheOrder
Workflow Adjustments
2 parents 1b388e1 + 35a1d4c commit 51f998a

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎.github/workflows/discord-releases.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
jobs:
66
github-releases-to-discord:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-24.04
88
steps:
99
- name: Checkout
1010
uses: actions/checkout@v4

‎.github/workflows/run-phpstan-pull.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
os: [ubuntu-latest]
15+
os: [ubuntu-24.04]
1616
php: [8.3]
1717
laravel: [11]
1818
stability: [prefer-dist]
1919

2020
name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2121
env:
2222
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
23-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
23+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, exif, iconv, fileinfo
2424

2525
steps:
2626
- name: Checkout code
@@ -47,7 +47,7 @@ jobs:
4747
php-version: ${{ matrix.php }}
4848
extensions: ${{ env.extensions }}
4949
coverage: pcov
50-
tools: phpunit:9.5
50+
tools: phpunit:11.4
5151
env:
5252
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5353

‎.github/workflows/run-phpstan.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
os: [ubuntu-latest]
18+
os: [ubuntu-24.04]
1919
php: [8.3]
2020
laravel: [11]
2121
stability: [prefer-dist]
2222

2323
name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2424
env:
2525
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
26-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
26+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, exif, iconv, fileinfo
2727

2828
steps:
2929
- name: Checkout code
@@ -50,7 +50,7 @@ jobs:
5050
php-version: ${{ matrix.php }}
5151
extensions: ${{ env.extensions }}
5252
coverage: pcov
53-
tools: phpunit:9.5
53+
tools: phpunit:11.4
5454
env:
5555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5656

‎.github/workflows/run-tests-pcov-pull.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
os: [ubuntu-latest]
19+
os: [ubuntu-24.04]
2020
php: [8.3]
2121
laravel: [11]
2222
stability: [prefer-dist]
2323

2424
name: PCOV - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
2525
env:
2626
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-withpcov
27-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
27+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, fileinfo
2828

2929
steps:
3030
- name: Checkout code
@@ -37,7 +37,14 @@ jobs:
3737
php-version: ${{ matrix.php }}
3838
extensions: ${{ env.extensions }}
3939
key: ${{ env.extensionKey }}
40-
40+
41+
- name: Cache extensions
42+
uses: actions/cache@v4
43+
with:
44+
path: ${{ steps.extcache.outputs.dir }}
45+
key: ${{ steps.extcache.outputs.key }}
46+
restore-keys: ${{ steps.extcache.outputs.key }}
47+
4148
- name: Setup PHP
4249
uses: shivammathur/setup-php@v2
4350
with:
@@ -49,13 +56,6 @@ jobs:
4956
env:
5057
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5158

52-
- name: Cache extensions
53-
uses: actions/cache@v4
54-
with:
55-
path: ${{ steps.extcache.outputs.dir }}
56-
key: ${{ steps.extcache.outputs.key }}
57-
restore-keys: ${{ steps.extcache.outputs.key }}
58-
5959
- name: Setup problem matchers for PHP
6060
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
6161

@@ -91,7 +91,7 @@ jobs:
9191
run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
9292

9393
- name: Upload coverage reports to Codecov
94-
uses: codecov/codecov-action@v4
94+
uses: codecov/codecov-action@v5
9595
env:
9696
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9797
with:

‎.github/workflows/run-tests-pull.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
max-parallel: 3
1515
matrix:
1616
os: [ubuntu-latest]
17-
php: [8.1, 8.2, 8.3]
17+
php: [8.1, 8.2, 8.3, 8.4]
1818
laravel: [10.*]
1919
stability: [prefer-dist]
2020

2121
name: PULL PHP-${{ matrix.php }} - Laravel-10
2222
env:
2323
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
24-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
24+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, fileinfo, :psr
2525

2626
steps:
2727
- name: Checkout code
@@ -95,14 +95,14 @@ jobs:
9595
max-parallel: 2
9696
matrix:
9797
os: [ubuntu-latest]
98-
php: [8.2, 8.3]
98+
php: [8.2, 8.3, 8.4]
9999
laravel: [11.*]
100100
stability: [prefer-dist]
101101

102102
name: PULL PHP-${{ matrix.php }} - Laravel-11
103103
env:
104104
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
105-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
105+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, fileinfo, :psr
106106

107107
steps:
108108
- name: Checkout code

‎.github/workflows/run-tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
fail-fast: false
1616
max-parallel: 3
1717
matrix:
18-
os: [ubuntu-latest]
19-
php: [8.1, 8.2, 8.3]
18+
os: [ubuntu-24.04]
19+
php: [8.1, 8.2, 8.3, 8.4]
2020
laravel: [10.*]
2121
stability: [prefer-dist]
2222

2323
name: PHP-${{ matrix.php }} - Laravel-10
2424
env:
2525
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
26-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
26+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, fileinfo, :psr
2727

2828
steps:
2929
- name: Checkout code
@@ -96,15 +96,15 @@ jobs:
9696
fail-fast: false
9797
max-parallel: 2
9898
matrix:
99-
os: [ubuntu-latest]
100-
php: [8.2, 8.3]
99+
os: [ubuntu-24.04]
100+
php: [8.2, 8.3, 8.4]
101101
laravel: [11.*]
102102
stability: [prefer-dist]
103103

104104
name: PHP-${{ matrix.php }} - Laravel-11
105105
env:
106106
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
107-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
107+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, fileinfo, :psr
108108

109109
steps:
110110
- name: Checkout code

0 commit comments

Comments
 (0)