Skip to content

Commit d8e7d12

Browse files
lrljoelrljoe
authored
Swap to using matrix os rather than runner
1 parent e6392da commit d8e7d12

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
- uses: actions/cache@v4
6363
with:
6464
path: ${{ steps.composer-cache.outputs.dir }}
65-
key: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
66-
restore-keys: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
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-
6767

6868
- name: Add token
6969
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ jobs:
7373
- uses: actions/cache@v4
7474
with:
7575
path: ${{ steps.composer-cache.outputs.dir }}
76-
key: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
77-
restore-keys: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
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-
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: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
70-
restore-keys: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-
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-
7171

7272
- name: Add token
7373
run: |

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
uses: actions/cache@v4
4040
with:
4141
path: ${{ steps.extcache.outputs.dir }}
42-
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
43-
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
42+
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
43+
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
4444

4545
- name: Setup PHP
4646
uses: shivammathur/setup-php@v2
@@ -64,8 +64,8 @@ jobs:
6464
- uses: actions/cache@v4
6565
with:
6666
path: ${{ steps.composer-cache.outputs.dir }}
67-
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
68-
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
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-
6969

7070
- name: Add token
7171
run: |
@@ -118,8 +118,8 @@ jobs:
118118
uses: actions/cache@v4
119119
with:
120120
path: ${{ steps.extcache.outputs.dir }}
121-
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
122-
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
121+
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
122+
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
123123

124124
- name: Setup PHP
125125
uses: shivammathur/setup-php@v2
@@ -143,8 +143,8 @@ jobs:
143143
- uses: actions/cache@v4
144144
with:
145145
path: ${{ steps.composer-cache.outputs.dir }}
146-
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
147-
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
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-
148148

149149
- name: Add token
150150
run: |

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
uses: actions/cache@v4
5050
with:
5151
path: ${{ steps.extcache.outputs.dir }}
52-
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
53-
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
52+
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
53+
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
5454

5555
- name: Setup PHP
5656
uses: shivammathur/setup-php@v2
@@ -74,8 +74,8 @@ jobs:
7474
- uses: actions/cache@v4
7575
with:
7676
path: ${{ steps.composer-cache.outputs.dir }}
77-
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
78-
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
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-
7979

8080
- name: Add token
8181
run: |
@@ -136,8 +136,8 @@ jobs:
136136
uses: actions/cache@v4
137137
with:
138138
path: ${{ steps.extcache.outputs.dir }}
139-
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
140-
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
139+
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
140+
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
141141

142142
- name: Setup PHP
143143
uses: shivammathur/setup-php@v2
@@ -161,8 +161,8 @@ jobs:
161161
- uses: actions/cache@v4
162162
with:
163163
path: ${{ steps.composer-cache.outputs.dir }}
164-
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
165-
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
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-
166166

167167
- name: Add token
168168
run: |

0 commit comments

Comments
 (0)