Skip to content

Commit 66987c6

Browse files
authored
chore: bump package version (#264)
1 parent 6bd931b commit 66987c6

File tree

16 files changed

+345
-153
lines changed

16 files changed

+345
-153
lines changed

.github/.cache_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2
1+
4

.github/actions/cache/action.yml

Lines changed: 65 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ runs:
2929
path: ${{ steps.yarn-cache-dir.outputs.dir || '.yarn/cache' }}
3030
key: node-cache-${{ env.CACHE_VERSION }}-yarn-${{ hashFiles('yarn.lock') }}
3131

32-
- name: Install JavaScript dependencies
33-
shell: bash
34-
run: yarn install
35-
3632
# Java setup: used during 'java' generation or 'cts'
3733
- name: Download Java formatter
3834
if: ${{ inputs.language == 'java' || inputs.job == 'cts' }}
@@ -157,8 +153,7 @@ runs:
157153
key: |
158154
${{ env.CACHE_VERSION }}-${{
159155
hashFiles(
160-
'clients/algoliasearch-client-javascript/packages/client-common/**',
161-
'!clients/algoliasearch-client-javascript/packages/client-common/dist'
156+
'clients/algoliasearch-client-javascript/packages/client-common/**'
162157
)}}
163158
164159
- name: Restore built JavaScript node requester
@@ -169,8 +164,7 @@ runs:
169164
key: |
170165
${{ env.CACHE_VERSION }}-${{
171166
hashFiles(
172-
'clients/algoliasearch-client-javascript/packages/requester-node-http/**',
173-
'!clients/algoliasearch-client-javascript/packages/requester-node-http/dist'
167+
'clients/algoliasearch-client-javascript/packages/requester-node-http/**'
174168
)}}
175169
176170
- name: Restore built JavaScript browser requester
@@ -181,8 +175,7 @@ runs:
181175
key: |
182176
${{ env.CACHE_VERSION }}-${{
183177
hashFiles(
184-
'clients/algoliasearch-client-javascript/packages/requester-browser-xhr/**',
185-
'!clients/algoliasearch-client-javascript/packages/requester-browser-xhr/dist'
178+
'clients/algoliasearch-client-javascript/packages/requester-browser-xhr/**'
186179
)}}
187180
188181
# Restore JavaScript clients: used during 'cts' or 'codegen'
@@ -195,7 +188,10 @@ runs:
195188
${{ env.CACHE_VERSION }}-${{
196189
hashFiles(
197190
'clients/algoliasearch-client-javascript/packages/algoliasearch/**',
198-
'!clients/algoliasearch-client-javascript/packages/algoliasearch/dist'
191+
'clients/algoliasearch-client-javascript/packages/client-search/**',
192+
'clients/algoliasearch-client-javascript/packages/client-analytics/**',
193+
'clients/algoliasearch-client-javascript/packages/client-personalization/**',
194+
'templates/javascript/**'
199195
)}}
200196
201197
- name: Restore built JavaScript search client
@@ -206,9 +202,12 @@ runs:
206202
key: |
207203
${{ env.CACHE_VERSION }}-${{
208204
hashFiles(
209-
'clients/algoliasearch-client-javascript/packages/client-search/**',
210-
'!clients/algoliasearch-client-javascript/packages/client-search/dist',
211-
'specs/bundled/search.yml'
205+
'clients/algoliasearch-client-javascript/packages/client-search/src/**',
206+
'clients/algoliasearch-client-javascript/packages/client-search/model/**',
207+
'clients/algoliasearch-client-javascript/packages/client-search/builds/**',
208+
'clients/algoliasearch-client-javascript/packages/client-search/package.json',
209+
'specs/bundled/search.yml',
210+
'templates/javascript/**'
212211
)}}
213212
214213
- name: Restore built JavaScript recommend client
@@ -219,9 +218,12 @@ runs:
219218
key: |
220219
${{ env.CACHE_VERSION }}-${{
221220
hashFiles(
222-
'clients/algoliasearch-client-javascript/packages/recommend/**',
223-
'!clients/algoliasearch-client-javascript/packages/recommend/dist',
224-
'specs/bundled/recommend.yml'
221+
'clients/algoliasearch-client-javascript/packages/recommend/src/**',
222+
'clients/algoliasearch-client-javascript/packages/recommend/model/**',
223+
'clients/algoliasearch-client-javascript/packages/recommend/builds/**',
224+
'clients/algoliasearch-client-javascript/packages/recommend/package.json',
225+
'specs/bundled/recommend.yml',
226+
'templates/javascript/**'
225227
)}}
226228
227229
- name: Restore built JavaScript query-suggestions client
@@ -232,9 +234,12 @@ runs:
232234
key: |
233235
${{ env.CACHE_VERSION }}-${{
234236
hashFiles(
235-
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/**',
236-
'!clients/algoliasearch-client-javascript/packages/client-query-suggestions/dist',
237-
'specs/bundled/query-suggestions.yml'
237+
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/src/**',
238+
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/model/**',
239+
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/**',
240+
'clients/algoliasearch-client-javascript/packages/client-query-suggestions/package.json',
241+
'specs/bundled/query-suggestions.yml',
242+
'templates/javascript/**'
238243
)}}
239244
240245
- name: Restore built JavaScript personalization client
@@ -245,9 +250,12 @@ runs:
245250
key: |
246251
${{ env.CACHE_VERSION }}-${{
247252
hashFiles(
248-
'clients/algoliasearch-client-javascript/packages/client-personalization/**',
249-
'!clients/algoliasearch-client-javascript/packages/client-personalization/dist',
250-
'specs/bundled/personalization.yml'
253+
'clients/algoliasearch-client-javascript/packages/client-personalization/src/**',
254+
'clients/algoliasearch-client-javascript/packages/client-personalization/model/**',
255+
'clients/algoliasearch-client-javascript/packages/client-personalization/builds/**',
256+
'clients/algoliasearch-client-javascript/packages/client-personalization/package.json',
257+
'specs/bundled/personalization.yml',
258+
'templates/javascript/**'
251259
)}}
252260
253261
- name: Restore built JavaScript analytics client
@@ -258,9 +266,12 @@ runs:
258266
key: |
259267
${{ env.CACHE_VERSION }}-${{
260268
hashFiles(
261-
'clients/algoliasearch-client-javascript/packages/client-analytics/**',
262-
'!clients/algoliasearch-client-javascript/packages/client-analytics/dist',
263-
'specs/bundled/analytics.yml'
269+
'clients/algoliasearch-client-javascript/packages/client-analytics/src/**',
270+
'clients/algoliasearch-client-javascript/packages/client-analytics/model/**',
271+
'clients/algoliasearch-client-javascript/packages/client-analytics/builds/**',
272+
'clients/algoliasearch-client-javascript/packages/client-analytics/package.json',
273+
'specs/bundled/analytics.yml',
274+
'templates/javascript/**'
264275
)}}
265276
266277
- name: Restore built JavaScript abtesting client
@@ -271,9 +282,12 @@ runs:
271282
key: |
272283
${{ env.CACHE_VERSION }}-${{
273284
hashFiles(
274-
'clients/algoliasearch-client-javascript/packages/client-abtesting/**',
275-
'!clients/algoliasearch-client-javascript/packages/client-abtesting/dist',
276-
'specs/bundled/abtesting.yml'
285+
'clients/algoliasearch-client-javascript/packages/client-abtesting/src/**',
286+
'clients/algoliasearch-client-javascript/packages/client-abtesting/model/**',
287+
'clients/algoliasearch-client-javascript/packages/client-abtesting/builds/**',
288+
'clients/algoliasearch-client-javascript/packages/client-abtesting/package.json',
289+
'specs/bundled/abtesting.yml',
290+
'templates/javascript/**'
277291
)}}
278292
279293
- name: Restore built JavaScript insights client
@@ -284,9 +298,12 @@ runs:
284298
key: |
285299
${{ env.CACHE_VERSION }}-${{
286300
hashFiles(
287-
'clients/algoliasearch-client-javascript/packages/client-insights/**',
288-
'!clients/algoliasearch-client-javascript/packages/client-insights/dist',
289-
'specs/bundled/insights.yml'
301+
'clients/algoliasearch-client-javascript/packages/client-insights/src/**',
302+
'clients/algoliasearch-client-javascript/packages/client-insights/model/**',
303+
'clients/algoliasearch-client-javascript/packages/client-insights/builds/**',
304+
'clients/algoliasearch-client-javascript/packages/client-insights/package.json',
305+
'specs/bundled/insights.yml',
306+
'templates/javascript/**'
290307
)}}
291308
292309
- name: Restore built JavaScript sources client
@@ -297,9 +314,12 @@ runs:
297314
key: |
298315
${{ env.CACHE_VERSION }}-${{
299316
hashFiles(
300-
'clients/algoliasearch-client-javascript/packages/client-sources/**',
301-
'!clients/algoliasearch-client-javascript/packages/client-sources/dist',
302-
'specs/bundled/sources.yml'
317+
'clients/algoliasearch-client-javascript/packages/client-sources/src/**',
318+
'clients/algoliasearch-client-javascript/packages/client-sources/model/**',
319+
'clients/algoliasearch-client-javascript/packages/client-sources/builds/**',
320+
'clients/algoliasearch-client-javascript/packages/client-sources/package.json',
321+
'specs/bundled/sources.yml',
322+
'templates/javascript/**'
303323
)}}
304324
305325
- name: Restore built JavaScript predict client
@@ -310,9 +330,12 @@ runs:
310330
key: |
311331
${{ env.CACHE_VERSION }}-${{
312332
hashFiles(
313-
'clients/algoliasearch-client-javascript/packages/client-predict/**',
314-
'!clients/algoliasearch-client-javascript/packages/client-predict/dist',
315-
'specs/bundled/predict.yml'
333+
'clients/algoliasearch-client-javascript/packages/client-predict/src/**',
334+
'clients/algoliasearch-client-javascript/packages/client-predict/model/**',
335+
'clients/algoliasearch-client-javascript/packages/client-predict/builds/**',
336+
'clients/algoliasearch-client-javascript/packages/client-predict/package.json',
337+
'specs/bundled/predict.yml',
338+
'templates/javascript/**'
316339
)}}
317340
318341
# Restore Java clients: used during 'cts' or 'codegen'
@@ -325,7 +348,6 @@ runs:
325348
${{ env.CACHE_VERSION }}-${{
326349
hashFiles(
327350
'clients/algoliasearch-client-java-2/**',
328-
'!clients/algoliasearch-client-java-2/target',
329351
'templates/java/**',
330352
'specs/bundled/search.yml'
331353
)}}
@@ -342,3 +364,7 @@ runs:
342364
'clients/algoliasearch-client-php/*',
343365
'specs/bundled/search.yml'
344366
)}}
367+
368+
- name: Install JavaScript dependencies
369+
shell: bash
370+
run: YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

.github/actions/setup/action.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,8 @@ runs:
100100
matrix=$(./scripts/ci/create-client-matrix.sh javascript $base_changed ${{ steps.diff.outputs.ORIGIN_BRANCH }})
101101
102102
if [[ $algoliasearch_changed == 'true' || $base_changed == 'true' ]]; then
103-
algoliasearch_client='{"name": "algoliasearch","folder": "clients/algoliasearch-client-javascript/packages/algoliasearch"}'
104-
105-
if [[ $matrix == '{"client":["no-run"]}' ]]; then
106-
matrix="{\"client\": [$algoliasearch_client]}"
107-
else
108-
matrix="{\"client\": $(echo $matrix | jq ".client + [$algoliasearch_client]" -c)}"
109-
fi
103+
echo "Running algoliasearch: true"
104+
echo "::set-output name=RUN_ALGOLIASEARCH::true"
110105
fi
111106
112107
if [[ $matrix == '{"client":["no-run"]}' ]]; then
@@ -185,6 +180,10 @@ outputs:
185180
description: Determine if the `client-javascript` job should run
186181
value: ${{ steps.js-matrix.outputs.RUN_CLIENT }}
187182

183+
RUN_JS_ALGOLIASEARCH:
184+
description: Determine if the `client-javascript-algoliasearch` job should run
185+
value: ${{ steps.js-matrix.outputs.RUN_ALGOLIASEARCH }}
186+
188187
RUN_JS_COMMON:
189188
description: Whether to build JS client common folders when RUN_JS is false
190189
value: ${{ steps.js-matrix.outputs.RUN_COMMON }}

.github/workflows/check.yml

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
SPECS_MATRIX: ${{ steps.setup.outputs.SPECS_MATRIX }}
3535

3636
RUN_JS: ${{ steps.setup.outputs.RUN_JS }}
37+
RUN_JS_ALGOLIASEARCH: ${{ steps.setup.outputs.RUN_JS_ALGOLIASEARCH }}
3738
RUN_JS_COMMON: ${{ steps.setup.outputs.RUN_JS_COMMON }}
3839
JS_MATRIX: ${{ steps.setup.outputs.JS_MATRIX }}
3940

@@ -118,8 +119,7 @@ jobs:
118119
key: |
119120
${{ env.CACHE_VERSION }}-${{
120121
hashFiles(
121-
format('clients/algoliasearch-client-javascript/packages/{0}/**', matrix.client),
122-
format('!clients/algoliasearch-client-javascript/packages/{0}/dist', matrix.client)
122+
format('clients/algoliasearch-client-javascript/packages/{0}/**', matrix.client)
123123
)}}
124124
125125
- name: Build '${{ matrix.client }}' client
@@ -157,19 +157,63 @@ jobs:
157157
key: |
158158
${{ env.CACHE_VERSION }}-${{
159159
hashFiles(
160-
format('{0}/**', matrix.client.folder),
161-
format('!{0}/dist', matrix.client.folder),
162-
format('specs/bundled/{0}.yml', matrix.client.name)
160+
format('{0}/src/**', matrix.client.folder),
161+
format('{0}/model/**', matrix.client.folder),
162+
format('{0}/builds/**', matrix.client.folder),
163+
format('{0}/package.json', matrix.client.folder),
164+
format('specs/bundled/{0}.yml', matrix.client.name),
165+
'templates/javascript/**'
163166
)}}
164167
165168
- name: Generate '${{ matrix.client.name }}' client
166-
if: steps.cache.outputs.cache-hit != 'true' && matrix.client.name != 'algoliasearch'
169+
if: steps.cache.outputs.cache-hit != 'true'
167170
run: yarn cli generate javascript ${{ matrix.client.name }}
168171

169172
- name: Build '${{ matrix.client.name }}' client
170173
if: steps.cache.outputs.cache-hit != 'true'
171174
run: yarn cli build clients javascript ${{ matrix.client.name }}
172175

176+
- name: Show diff for '${{ matrix.client.name }}' client
177+
if: steps.cache.outputs.cache-hit != 'true'
178+
run: git --no-pager diff
179+
180+
client_javascript_algoliasearch:
181+
timeout-minutes: 10
182+
runs-on: ubuntu-20.04
183+
needs: client_javascript
184+
if: |
185+
always() &&
186+
needs.setup.outputs.RUN_JS_ALGOLIASEARCH == 'true' &&
187+
contains(needs.client_javascript.result, 'success') &&
188+
!contains(needs.client_javascript.result, 'failure')
189+
steps:
190+
- uses: actions/checkout@v2
191+
192+
- name: Restore cache
193+
uses: ./.github/actions/cache
194+
with:
195+
job: codegen
196+
language: javascript
197+
198+
- name: Cache 'algoliasearch' client
199+
id: cache
200+
uses: actions/cache@v2
201+
with:
202+
path: clients/algoliasearch-client-javascript/packages/algoliasearch
203+
key: |
204+
${{ env.CACHE_VERSION }}-${{
205+
hashFiles(
206+
'clients/algoliasearch-client-javascript/packages/algoliasearch/**',
207+
'clients/algoliasearch-client-javascript/packages/client-search/**',
208+
'clients/algoliasearch-client-javascript/packages/client-analytics/**',
209+
'clients/algoliasearch-client-javascript/packages/client-personalization/**',
210+
'templates/javascript/**'
211+
)}}
212+
213+
- name: Build 'algoliasearch' client
214+
if: steps.cache.outputs.cache-hit != 'true'
215+
run: yarn cli build clients javascript algoliasearch
216+
173217
client_java:
174218
runs-on: ubuntu-20.04
175219
timeout-minutes: 10
@@ -201,7 +245,6 @@ jobs:
201245
${{ env.CACHE_VERSION }}-${{
202246
hashFiles(
203247
format('{0}/**', matrix.client.folder),
204-
format('!{0}/target', matrix.client.folder),
205248
'templates/java/**',
206249
format('specs/bundled/{0}.yml', matrix.client.name)
207250
)}}
@@ -261,6 +304,7 @@ jobs:
261304
timeout-minutes: 20
262305
needs:
263306
- client_javascript
307+
- client_javascript_algoliasearch
264308
- client_java
265309
- client_php
266310
if: |

clients/algoliasearch-client-javascript/packages/algoliasearch/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@experimental-api-clients-automation/algoliasearch",
3-
"version": "0.0.4",
3+
"version": "0.0.5",
44
"description": "A fully-featured and blazing-fast JavaScript API client to interact with Algolia API.",
55
"repository": "algolia/algoliasearch-client-javascript",
66
"author": "Algolia",
@@ -18,12 +18,12 @@
1818
"node": ">= 14.0.0"
1919
},
2020
"dependencies": {
21-
"@experimental-api-clients-automation/client-analytics": "0.0.4",
22-
"@experimental-api-clients-automation/client-common": "0.0.4",
23-
"@experimental-api-clients-automation/client-personalization": "0.0.4",
24-
"@experimental-api-clients-automation/client-search": "0.0.4",
25-
"@experimental-api-clients-automation/requester-browser-xhr": "0.0.4",
26-
"@experimental-api-clients-automation/requester-node-http": "0.0.4"
21+
"@experimental-api-clients-automation/client-analytics": "0.0.5",
22+
"@experimental-api-clients-automation/client-common": "0.0.5",
23+
"@experimental-api-clients-automation/client-personalization": "0.0.5",
24+
"@experimental-api-clients-automation/client-search": "0.0.5",
25+
"@experimental-api-clients-automation/requester-browser-xhr": "0.0.5",
26+
"@experimental-api-clients-automation/requester-node-http": "0.0.5"
2727
},
2828
"devDependencies": {
2929
"@types/node": "16.11.11",

clients/algoliasearch-client-javascript/packages/client-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@experimental-api-clients-automation/client-common",
3-
"version": "0.0.4",
3+
"version": "0.0.5",
44
"description": "Common package for the Algolia JavaScript API client.",
55
"repository": "algolia/algoliasearch-client-javascript",
66
"author": "Algolia",

clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@experimental-api-clients-automation/requester-browser-xhr",
3-
"version": "0.0.4",
3+
"version": "0.0.5",
44
"description": "Promise-based request library for browser using xhr.",
55
"repository": "algolia/algoliasearch-client-javascript",
66
"author": "Algolia",
@@ -21,7 +21,7 @@
2121
"index.ts"
2222
],
2323
"dependencies": {
24-
"@experimental-api-clients-automation/client-common": "0.0.4"
24+
"@experimental-api-clients-automation/client-common": "0.0.5"
2525
},
2626
"devDependencies": {
2727
"@types/node": "16.11.11",

0 commit comments

Comments
 (0)