Skip to content

Commit 164ef77

Browse files
millotpmillotp
committed
try @shortcuts idea
1 parent 4a3ea86 commit 164ef77

File tree

3 files changed

+58
-93
lines changed

3 files changed

+58
-93
lines changed

‎.github/actions/cache/action.yml

Lines changed: 42 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,21 @@ inputs:
99
language:
1010
description: The language to retrieve dependencies.
1111
required: false
12-
cache_version:
13-
description: the cache version that includes the common change hash
14-
required: true
15-
skip_yarn:
16-
description: true if you want to skip yarn install
17-
required: false
1812

1913
runs:
2014
using: composite
2115
steps:
2216
# JavaScript setup
2317
- name: Get yarn cache directory path
2418
shell: bash
25-
if: ${{ inputs.skip_yarn != 'true' }}
2619
id: yarn-cache-dir
27-
run: |
28-
echo "::set-output name=dir::$(yarn config get cacheFolder)"
29-
echo "::set-output name=cache::$(< .github/.cache_version)"
20+
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
3021

3122
- name: Restore Yarn
32-
if: ${{ inputs.skip_yarn != 'true' }}
3323
uses: actions/cache@v2
3424
with:
3525
path: ${{ steps.yarn-cache-dir.outputs.dir || '.yarn/cache' }}
36-
key: node-cache-${{ steps.yarn-cache-dir.outputs.cache }}-yarn-${{ hashFiles('yarn.lock') }}
26+
key: node-cache-${{ env.CACHE_VERSION }}-yarn-${{ hashFiles('yarn.lock') }}
3727

3828
# Java setup: used during 'java' generation or 'cts'
3929
- name: Download Java formatter
@@ -48,7 +38,7 @@ runs:
4838
with:
4939
path: specs/bundled/abtesting.yml
5040
key: |
51-
${{ inputs.cache_version }}-${{
41+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
5242
hashFiles(
5343
'specs/abtesting/**',
5444
'specs/common/**'
@@ -60,7 +50,7 @@ runs:
6050
with:
6151
path: specs/bundled/analytics.yml
6252
key: |
63-
${{ inputs.cache_version }}-${{
53+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
6454
hashFiles(
6555
'specs/analytics/**',
6656
'specs/common/**'
@@ -72,7 +62,7 @@ runs:
7262
with:
7363
path: specs/bundled/insights.yml
7464
key: |
75-
${{ inputs.cache_version }}-${{
65+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
7666
hashFiles(
7767
'specs/insights/**',
7868
'specs/common/**'
@@ -84,7 +74,7 @@ runs:
8474
with:
8575
path: specs/bundled/personalization.yml
8676
key: |
87-
${{ inputs.cache_version }}-${{
77+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
8878
hashFiles(
8979
'specs/personalization/**',
9080
'specs/common/**'
@@ -96,7 +86,7 @@ runs:
9686
with:
9787
path: specs/bundled/predict.yml
9888
key: |
99-
${{ inputs.cache_version }}-${{
89+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
10090
hashFiles(
10191
'specs/predict/**',
10292
'specs/common/**'
@@ -108,7 +98,7 @@ runs:
10898
with:
10999
path: specs/bundled/query-suggestions.yml
110100
key: |
111-
${{ inputs.cache_version }}-${{
101+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
112102
hashFiles(
113103
'specs/query-suggestions/**',
114104
'specs/common/**'
@@ -120,7 +110,7 @@ runs:
120110
with:
121111
path: specs/bundled/recommend.yml
122112
key: |
123-
${{ inputs.cache_version }}-${{
113+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
124114
hashFiles(
125115
'specs/recommend/**',
126116
'specs/common/**'
@@ -132,7 +122,7 @@ runs:
132122
with:
133123
path: specs/bundled/search.yml
134124
key: |
135-
${{ inputs.cache_version }}-${{
125+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
136126
hashFiles(
137127
'specs/search/**',
138128
'specs/common/**'
@@ -144,7 +134,7 @@ runs:
144134
with:
145135
path: specs/bundled/algoliasearch-lite.yml
146136
key: |
147-
${{ inputs.cache_version }}-${{
137+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
148138
hashFiles(
149139
'specs/search/**',
150140
'specs/common/**'
@@ -156,7 +146,7 @@ runs:
156146
with:
157147
path: specs/bundled/sources.yml
158148
key: |
159-
${{ inputs.cache_version }}-${{
149+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
160150
hashFiles(
161151
'specs/sources/**',
162152
'specs/common/**'
@@ -169,7 +159,7 @@ runs:
169159
with:
170160
path: clients/algoliasearch-client-javascript/packages/client-common
171161
key: |
172-
${{ inputs.cache_version }}-${{
162+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
173163
hashFiles(
174164
'clients/algoliasearch-client-javascript/packages/client-common/src/**'
175165
)}}
@@ -180,7 +170,7 @@ runs:
180170
with:
181171
path: clients/algoliasearch-client-javascript/packages/requester-node-http
182172
key: |
183-
${{ inputs.cache_version }}-${{
173+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
184174
hashFiles(
185175
'clients/algoliasearch-client-javascript/packages/requester-node-http/src/**'
186176
)}}
@@ -191,7 +181,7 @@ runs:
191181
with:
192182
path: clients/algoliasearch-client-javascript/packages/requester-browser-xhr
193183
key: |
194-
${{ inputs.cache_version }}-${{
184+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
195185
hashFiles(
196186
'clients/algoliasearch-client-javascript/packages/requester-browser-xhr/src/**'
197187
)}}
@@ -203,7 +193,7 @@ runs:
203193
with:
204194
path: clients/algoliasearch-client-javascript/packages/algoliasearch
205195
key: |
206-
${{ inputs.cache_version }}-${{
196+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
207197
hashFiles(
208198
'clients/algoliasearch-client-javascript/packages/algoliasearch/**',
209199
'clients/algoliasearch-client-javascript/packages/client-search/**',
@@ -217,7 +207,7 @@ runs:
217207
with:
218208
path: clients/algoliasearch-client-javascript/packages/algoliasearch-lite
219209
key: |
220-
${{ inputs.cache_version }}-${{
210+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
221211
hashFiles(
222212
'clients/algoliasearch-client-javascript/packages/algoliasearch-lite/src/**',
223213
'clients/algoliasearch-client-javascript/packages/algoliasearch-lite/model/**',
@@ -234,7 +224,7 @@ runs:
234224
with:
235225
path: clients/algoliasearch-client-javascript/packages/client-search
236226
key: |
237-
${{ inputs.cache_version }}-${{
227+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
238228
hashFiles(
239229
'clients/algoliasearch-client-javascript/packages/client-search/src/**',
240230
'clients/algoliasearch-client-javascript/packages/client-search/model/**',
@@ -251,7 +241,7 @@ runs:
251241
with:
252242
path: clients/algoliasearch-client-javascript/packages/recommend
253243
key: |
254-
${{ inputs.cache_version }}-${{
244+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
255245
hashFiles(
256246
'clients/algoliasearch-client-javascript/packages/recommend/src/**',
257247
'clients/algoliasearch-client-javascript/packages/recommend/model/**',
@@ -268,7 +258,7 @@ runs:
268258
with:
269259
path: clients/algoliasearch-client-javascript/packages/client-query-suggestions
270260
key: |
271-
${{ inputs.cache_version }}-${{
261+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
272262
hashFiles(
273263
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/src/**',
274264
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/model/**',
@@ -285,7 +275,7 @@ runs:
285275
with:
286276
path: clients/algoliasearch-client-javascript/packages/client-personalization
287277
key: |
288-
${{ inputs.cache_version }}-${{
278+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
289279
hashFiles(
290280
'clients/algoliasearch-client-javascript/packages/client-personalization/src/**',
291281
'clients/algoliasearch-client-javascript/packages/client-personalization/model/**',
@@ -302,7 +292,7 @@ runs:
302292
with:
303293
path: clients/algoliasearch-client-javascript/packages/client-analytics
304294
key: |
305-
${{ inputs.cache_version }}-${{
295+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
306296
hashFiles(
307297
'clients/algoliasearch-client-javascript/packages/client-analytics/src/**',
308298
'clients/algoliasearch-client-javascript/packages/client-analytics/model/**',
@@ -319,7 +309,7 @@ runs:
319309
with:
320310
path: clients/algoliasearch-client-javascript/packages/client-abtesting
321311
key: |
322-
${{ inputs.cache_version }}-${{
312+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
323313
hashFiles(
324314
'clients/algoliasearch-client-javascript/packages/client-abtesting/src/**',
325315
'clients/algoliasearch-client-javascript/packages/client-abtesting/model/**',
@@ -336,7 +326,7 @@ runs:
336326
with:
337327
path: clients/algoliasearch-client-javascript/packages/client-insights
338328
key: |
339-
${{ inputs.cache_version }}-${{
329+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
340330
hashFiles(
341331
'clients/algoliasearch-client-javascript/packages/client-insights/src/**',
342332
'clients/algoliasearch-client-javascript/packages/client-insights/model/**',
@@ -353,7 +343,7 @@ runs:
353343
with:
354344
path: clients/algoliasearch-client-javascript/packages/client-sources
355345
key: |
356-
${{ inputs.cache_version }}-${{
346+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
357347
hashFiles(
358348
'clients/algoliasearch-client-javascript/packages/client-sources/src/**',
359349
'clients/algoliasearch-client-javascript/packages/client-sources/model/**',
@@ -370,7 +360,7 @@ runs:
370360
with:
371361
path: clients/algoliasearch-client-javascript/packages/client-predict
372362
key: |
373-
${{ inputs.cache_version }}-${{
363+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
374364
hashFiles(
375365
'clients/algoliasearch-client-javascript/packages/client-predict/src/**',
376366
'clients/algoliasearch-client-javascript/packages/client-predict/model/**',
@@ -388,7 +378,7 @@ runs:
388378
with:
389379
path: clients/algoliasearch-client-java-2/gradle.properties
390380
key: |
391-
${{ inputs.cache_version }}-${{
381+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
392382
hashFiles(
393383
'specs/bundled/search.yml',
394384
'templates/java/**',
@@ -403,7 +393,7 @@ runs:
403393
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/SearchClient.java
404394
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/search/**
405395
key: |
406-
${{ inputs.cache_version }}-${{
396+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
407397
hashFiles(
408398
'specs/bundled/search.yml',
409399
'templates/java/**',
@@ -418,7 +408,7 @@ runs:
418408
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/RecommendClient.java
419409
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/recommend/**
420410
key: |
421-
${{ inputs.cache_version }}-${{
411+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
422412
hashFiles(
423413
'specs/bundled/recommend.yml',
424414
'templates/java/**',
@@ -433,7 +423,7 @@ runs:
433423
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/PersonalizationClient.java
434424
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/personalization/**
435425
key: |
436-
${{ inputs.cache_version }}-${{
426+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
437427
hashFiles(
438428
'specs/bundled/personalization.yml',
439429
'templates/java/**',
@@ -448,7 +438,7 @@ runs:
448438
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/AnalyticsClient.java
449439
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/analytics/**
450440
key: |
451-
${{ inputs.cache_version }}-${{
441+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
452442
hashFiles(
453443
'specs/bundled/analytics.yml',
454444
'templates/java/**',
@@ -463,7 +453,7 @@ runs:
463453
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/InsightsClient.java
464454
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/insights/**
465455
key: |
466-
${{ inputs.cache_version }}-${{
456+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
467457
hashFiles(
468458
'specs/bundled/insights.yml',
469459
'templates/java/**',
@@ -478,7 +468,7 @@ runs:
478468
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/AbtestingClient.java
479469
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/abtesting/**
480470
key: |
481-
${{ inputs.cache_version }}-${{
471+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
482472
hashFiles(
483473
'specs/bundled/abtesting.yml',
484474
'templates/java/**',
@@ -493,7 +483,7 @@ runs:
493483
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/QuerySuggestionsClient.java
494484
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/querySuggestions/**
495485
key: |
496-
${{ inputs.cache_version }}-${{
486+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
497487
hashFiles(
498488
'specs/bundled/query-suggestions.yml',
499489
'templates/java/**',
@@ -508,7 +498,7 @@ runs:
508498
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/PredictClient.java
509499
clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/predict/**
510500
key: |
511-
${{ inputs.cache_version }}-${{
501+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
512502
hashFiles(
513503
'specs/bundled/predict.yml',
514504
'templates/java/**',
@@ -524,7 +514,7 @@ runs:
524514
clients/algoliasearch-client-php/lib/Api/SearchClient.php
525515
clients/algoliasearch-client-php/lib/Model/Search/**
526516
key: |
527-
${{ inputs.cache_version }}-${{
517+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
528518
hashFiles(
529519
'specs/bundled/search.yml',
530520
'templates/php/**',
@@ -539,7 +529,7 @@ runs:
539529
clients/algoliasearch-client-php/lib/Api/RecommendClient.php
540530
clients/algoliasearch-client-php/lib/Model/Recommend/**
541531
key: |
542-
${{ inputs.cache_version }}-${{
532+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
543533
hashFiles(
544534
'specs/bundled/recommend.yml',
545535
'templates/php/**',
@@ -554,7 +544,7 @@ runs:
554544
clients/algoliasearch-client-php/lib/Api/PersonalizationClient.php
555545
clients/algoliasearch-client-php/lib/Model/Personalization/**
556546
key: |
557-
${{ inputs.cache_version }}-${{
547+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
558548
hashFiles(
559549
'specs/bundled/personalization.yml',
560550
'templates/php/**',
@@ -569,7 +559,7 @@ runs:
569559
clients/algoliasearch-client-php/lib/Api/AnalyticsClient.php
570560
clients/algoliasearch-client-php/lib/Model/Analytics/**
571561
key: |
572-
${{ inputs.cache_version }}-${{
562+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
573563
hashFiles(
574564
'specs/bundled/analytics.yml',
575565
'templates/php/**',
@@ -584,7 +574,7 @@ runs:
584574
clients/algoliasearch-client-php/lib/Api/InsightsClient.php
585575
clients/algoliasearch-client-php/lib/Model/Insights/**
586576
key: |
587-
${{ inputs.cache_version }}-${{
577+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
588578
hashFiles(
589579
'specs/bundled/insights.yml',
590580
'templates/php/**',
@@ -599,7 +589,7 @@ runs:
599589
clients/algoliasearch-client-php/lib/Api/AbtestingClient.php
600590
clients/algoliasearch-client-php/lib/Model/Abtesting/**
601591
key: |
602-
${{ inputs.cache_version }}-${{
592+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
603593
hashFiles(
604594
'specs/bundled/abtesting.yml',
605595
'templates/php/**',
@@ -614,7 +604,7 @@ runs:
614604
clients/algoliasearch-client-php/lib/Api/QuerySuggestionsClient.php
615605
clients/algoliasearch-client-php/lib/Model/QuerySuggestions/**
616606
key: |
617-
${{ inputs.cache_version }}-${{
607+
${{ env.CACHE_VERSION }}-${{ env.CACHE_COMMON_HASH }}-${{
618608
hashFiles(
619609
'specs/bundled/query-suggestions.yml',
620610
'templates/php/**',
@@ -623,5 +613,4 @@ runs:
623613
624614
- name: Install JavaScript dependencies
625615
shell: bash
626-
if: ${{ inputs.skip_yarn != 'true' }}
627616
run: YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

0 commit comments

Comments
 (0)