Skip to content

Commit ae32564

Browse files
authored
Reuse Caches
1 parent 0fee4ab commit ae32564

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

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

2525
steps:
@@ -62,8 +62,8 @@ jobs:
6262
- uses: actions/cache@v4
6363
with:
6464
path: ${{ steps.composer-cache.outputs.dir }}
65-
key: ${{ matrix.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
66-
restore-keys: ${{ matrix.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
65+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
66+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
6767

6868
- name: Add token
6969
run: |

.github/workflows/run-phpstan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

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

2828
steps:
@@ -73,8 +73,8 @@ jobs:
7373
- uses: actions/cache@v4
7474
with:
7575
path: ${{ steps.composer-cache.outputs.dir }}
76-
key: ${{ matrix.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
77-
restore-keys: ${{ matrix.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
76+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
77+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
7878

7979
- name: Add token
8080
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ jobs:
6666
- uses: actions/cache@v4
6767
with:
6868
path: ${{ steps.composer-cache.outputs.dir }}
69-
key: ${{ matrix.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
70-
restore-keys: ${{ matrix.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-
69+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
70+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
7171

7272
- name: Add token
7373
run: |

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

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

2626
steps:
@@ -64,8 +64,8 @@ jobs:
6464
- uses: actions/cache@v4
6565
with:
6666
path: ${{ steps.composer-cache.outputs.dir }}
67-
key: ${{ matrix.os }}-PULL-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
68-
restore-keys: ${{ matrix.os }}-PULL-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
67+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
68+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
6969

7070
- name: Add token
7171
run: |
@@ -143,8 +143,8 @@ jobs:
143143
- uses: actions/cache@v4
144144
with:
145145
path: ${{ steps.composer-cache.outputs.dir }}
146-
key: ${{ matrix.os }}-PULL-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
147-
restore-keys: ${{ matrix.os }}-PULL-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
146+
key: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
147+
restore-keys: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
148148

149149
- name: Add token
150150
run: |

.github/workflows/run-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

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

2828
steps:
@@ -74,8 +74,8 @@ jobs:
7474
- uses: actions/cache@v4
7575
with:
7676
path: ${{ steps.composer-cache.outputs.dir }}
77-
key: ${{ matrix.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
78-
restore-keys: ${{ matrix.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
77+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
78+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
7979

8080
- name: Add token
8181
run: |
@@ -109,7 +109,7 @@ jobs:
109109

110110
name: PHP-${{ matrix.php }} - Laravel-11
111111
env:
112-
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
112+
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
113113
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
114114

115115
steps:
@@ -161,8 +161,8 @@ jobs:
161161
- uses: actions/cache@v4
162162
with:
163163
path: ${{ steps.composer-cache.outputs.dir }}
164-
key: ${{ matrix.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
165-
restore-keys: ${{ matrix.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
164+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
165+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
166166

167167
- name: Add token
168168
run: |

0 commit comments

Comments
 (0)