Skip to content

Commit ba89e56

Browse files
authored
Merge pull request #720 from pantheon-systems/bugs-4712-fix-caching
[BUGS-4712] Fix caching for web folder in github actions.
2 parents c90a30a + 202ac8e commit ba89e56

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.ci/.github/workflows/build_deploy_and_test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
cache-name: cache-composer-cache
9191
with:
9292
path: ~/.composer/cache
93-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
93+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
9494
restore-keys: |
9595
${{ runner.os }}-build-${{ env.cache-name }}-
9696
${{ runner.os }}-build-
@@ -120,7 +120,7 @@ jobs:
120120
cache-name: cache-composer-cache
121121
with:
122122
path: ~/.composer/cache
123-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
123+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
124124
restore-keys: |
125125
${{ runner.os }}-build-${{ env.cache-name }}-
126126
${{ runner.os }}-build-
@@ -132,15 +132,15 @@ jobs:
132132
cache-name: cache-vendor
133133
with:
134134
path: ./vendor
135-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
135+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
136136

137137
- name: Cache web folder
138138
uses: actions/cache@v2
139139
env:
140140
cache-name: cache-web
141141
with:
142142
path: ./web
143-
key: ${{ runner.os }}-build-${{ env.cache-name }}
143+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
144144

145145
- name: Cache drush folder
146146
uses: actions/cache@v2
@@ -188,7 +188,7 @@ jobs:
188188
cache-name: cache-composer-cache
189189
with:
190190
path: ~/.composer/cache
191-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
191+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
192192
restore-keys: |
193193
${{ runner.os }}-build-${{ env.cache-name }}-
194194
${{ runner.os }}-build-
@@ -200,15 +200,15 @@ jobs:
200200
cache-name: cache-vendor
201201
with:
202202
path: ./vendor
203-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
203+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
204204

205205
- name: Cache web folder
206206
uses: actions/cache@v2
207207
env:
208208
cache-name: cache-web
209209
with:
210210
path: ./web
211-
key: ${{ runner.os }}-build-${{ env.cache-name }}
211+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
212212

213213
- name: Cache drush folder
214214
uses: actions/cache@v2
@@ -266,7 +266,7 @@ jobs:
266266
cache-name: cache-composer-cache
267267
with:
268268
path: ~/.composer/cache
269-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
269+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
270270
restore-keys: |
271271
${{ runner.os }}-build-${{ env.cache-name }}-
272272
${{ runner.os }}-build-
@@ -278,7 +278,7 @@ jobs:
278278
cache-name: cache-vendor
279279
with:
280280
path: ./vendor
281-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
281+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
282282

283283
- name: Cache web folder
284284
uses: actions/cache@v2
@@ -375,7 +375,7 @@ jobs:
375375
cache-name: cache-composer-cache
376376
with:
377377
path: ~/.composer/cache
378-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
378+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
379379
restore-keys: |
380380
${{ runner.os }}-build-${{ env.cache-name }}-
381381
${{ runner.os }}-build-
@@ -387,7 +387,7 @@ jobs:
387387
cache-name: cache-vendor
388388
with:
389389
path: ./vendor
390-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
390+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('composer.lock') }}
391391

392392
- name: Cache web folder
393393
uses: actions/cache@v2

0 commit comments

Comments
 (0)