Skip to content

Commit 0941389

Browse files
authored
chore(ci): skip CI and fix order (#374)
1 parent 72ff5e3 commit 0941389

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

.github/workflows/check.yml

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -191,42 +191,6 @@ jobs:
191191
if: steps.cache.outputs.cache-hit != 'true'
192192
run: git --no-pager diff
193193

194-
client_javascript_algoliasearch:
195-
timeout-minutes: 10
196-
runs-on: ubuntu-20.04
197-
needs: client_javascript
198-
if: |
199-
always() &&
200-
needs.setup.outputs.RUN_JS_ALGOLIASEARCH == 'true' &&
201-
!contains(needs.*.result, 'cancelled') &&
202-
!contains(needs.*.result, 'failure')
203-
steps:
204-
- uses: actions/checkout@v2
205-
206-
- name: Restore cache
207-
uses: ./.github/actions/cache
208-
with:
209-
job: codegen
210-
language: javascript
211-
212-
- name: Cache 'algoliasearch' client
213-
id: cache
214-
uses: actions/cache@v2
215-
with:
216-
path: clients/algoliasearch-client-javascript/packages/algoliasearch
217-
key: |
218-
${{ env.CACHE_VERSION }}-${{
219-
hashFiles(
220-
'clients/algoliasearch-client-javascript/packages/algoliasearch/**',
221-
'clients/algoliasearch-client-javascript/packages/client-search/**',
222-
'clients/algoliasearch-client-javascript/packages/client-analytics/**',
223-
'clients/algoliasearch-client-javascript/packages/client-personalization/**'
224-
)}}
225-
226-
- name: Build 'algoliasearch' client
227-
if: steps.cache.outputs.cache-hit != 'true'
228-
run: yarn cli build clients javascript algoliasearch
229-
230194
client_java:
231195
runs-on: ubuntu-20.04
232196
timeout-minutes: 10
@@ -327,12 +291,46 @@ jobs:
327291
if: steps.cache.outputs.cache-hit != 'true'
328292
run: git --no-pager diff
329293

294+
client_javascript_algoliasearch:
295+
timeout-minutes: 10
296+
runs-on: ubuntu-20.04
297+
needs: client_javascript
298+
if: |
299+
always() &&
300+
needs.setup.outputs.RUN_JS_ALGOLIASEARCH == 'true' &&
301+
!contains(needs.*.result, 'cancelled') &&
302+
!contains(needs.*.result, 'failure')
303+
steps:
304+
- uses: actions/checkout@v2
305+
306+
- name: Restore cache
307+
uses: ./.github/actions/cache
308+
with:
309+
job: codegen
310+
language: javascript
311+
312+
- name: Cache 'algoliasearch' client
313+
id: cache
314+
uses: actions/cache@v2
315+
with:
316+
path: clients/algoliasearch-client-javascript/packages/algoliasearch
317+
key: |
318+
${{ env.CACHE_VERSION }}-${{
319+
hashFiles(
320+
'clients/algoliasearch-client-javascript/packages/algoliasearch/**',
321+
'clients/algoliasearch-client-javascript/packages/client-search/**',
322+
'clients/algoliasearch-client-javascript/packages/client-analytics/**',
323+
'clients/algoliasearch-client-javascript/packages/client-personalization/**'
324+
)}}
325+
326+
- name: Build 'algoliasearch' client
327+
if: steps.cache.outputs.cache-hit != 'true'
328+
run: yarn cli build clients javascript algoliasearch
329+
330330
client_javascript_tests:
331331
runs-on: ubuntu-20.04
332332
timeout-minutes: 10
333-
needs:
334-
- client_javascript
335-
- client_javascript_algoliasearch
333+
needs: client_javascript
336334
if: |
337335
always() &&
338336
needs.setup.outputs.RUN_JS_TESTS == 'true' &&
@@ -354,7 +352,6 @@ jobs:
354352
timeout-minutes: 20
355353
needs:
356354
- client_javascript
357-
- client_javascript_algoliasearch
358355
- client_java
359356
- client_php
360357
if: |
@@ -390,6 +387,7 @@ jobs:
390387
needs:
391388
- cts
392389
- client_javascript_tests
390+
- client_javascript_algoliasearch
393391
if: |
394392
always() &&
395393
needs.setup.outputs.RUN_CODEGEN == 'true' &&

scripts/ci/codegen/pushGeneratedCode.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ export async function pushGeneratedCode(): Promise<void> {
4949
}
5050

5151
const commitMessage =
52-
await run(`git show -s ${baseBranch} --format="chore: generated code for commit %H.
52+
await run(`git show -s ${baseBranch} --format="chore: generated code for commit %H. ${
53+
isMainBranch ? '[skip ci]' : ''
54+
}
5355
5456
Co-authored-by: %an <%ae>"`);
5557

0 commit comments

Comments
 (0)