Skip to content

Commit 5c22958

Browse files
ndelangenndelangen
committed
fix the ci configs
1 parent f75593e commit 5c22958

File tree

3 files changed

+72
-70
lines changed

3 files changed

+72
-70
lines changed

‎.circleci/config.yml‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ jobs:
8787
name: Restore Yarn cache
8888
keys:
8989
- build-yarn-2-cache-v3--{{ checksum "code/yarn.lock" }}
90-
- run:
91-
name: Change directory
92-
command: cd code
9390
- run:
9491
name: Install dependencies
95-
command: yarn install --immutable
92+
command: |
93+
cd code
94+
yarn install --immutable
9695
- run:
9796
name: Bootstrap
9897
command: |
98+
cd code
9999
yarn bootstrap --build
100100
git diff --exit-code
101101
- save_cache:
@@ -106,13 +106,13 @@ jobs:
106106
- persist_to_workspace:
107107
root: .
108108
paths:
109-
- examples
110-
- node_modules
111-
- addons
112-
- frameworks
113-
- lib
114-
- renderers
115-
- presets
109+
- code/examples
110+
- code/node_modules
111+
- code/addons
112+
- code/frameworks
113+
- code/lib
114+
- code/renderers
115+
- code/presets
116116
chromatic:
117117
executor: sb_node_14_browsers
118118
parallelism: 15
@@ -121,12 +121,10 @@ jobs:
121121
- checkout
122122
- attach_workspace:
123123
at: .
124-
- run:
125-
name: Change directory
126-
command: cd code
127124
- run:
128125
name: chromatic
129126
command: |
127+
cd code
130128
yarn run-chromatics
131129
examples:
132130
executor:
@@ -138,16 +136,15 @@ jobs:
138136
clone_options: '--depth 1 --verbose'
139137
- attach_workspace:
140138
at: .
141-
- run:
142-
name: Change directory
143-
command: cd code
144139
- run:
145140
name: examples
146-
command: yarn build-storybooks --all
141+
command: |
142+
cd code
143+
yarn build-storybooks --all
147144
- persist_to_workspace:
148145
root: .
149146
paths:
150-
- built-storybooks
147+
- code/built-storybooks
151148
publish:
152149
executor:
153150
class: medium
@@ -157,16 +154,15 @@ jobs:
157154
clone_options: '--depth 1 --verbose'
158155
- attach_workspace:
159156
at: .
160-
- run:
161-
name: Change directory
162-
command: cd code
163157
- run:
164158
name: running local registry
165-
command: yarn local-registry --publish
159+
command: |
160+
cd code
161+
yarn local-registry --publish
166162
- persist_to_workspace:
167163
root: .
168164
paths:
169-
- .verdaccio-cache
165+
- code/.verdaccio-cache
170166
e2e-tests-extended:
171167
executor:
172168
class: medium
@@ -187,19 +183,22 @@ jobs:
187183
clone_options: '--depth 1 --verbose'
188184
- attach_workspace:
189185
at: .
190-
- run:
191-
name: Change directory
192-
command: cd code
193186
- run:
194187
name: running local registry
195-
command: yarn local-registry --port 6000 --open
188+
command: |
189+
cd code
190+
yarn local-registry --port 6000 --open
196191
background: true
197192
- run:
198193
name: Wait for registry
199-
command: yarn wait-on http://localhost:6000
194+
command: |
195+
cd code
196+
yarn wait-on http://localhost:6000
200197
- run:
201198
name: Run E2E (extended) tests
202-
command: yarn test:e2e-framework --clean --all --skip angular --skip angular12 --skip vue3 --skip web_components_typescript --skip cra --skip react
199+
command: |
200+
cd code
201+
yarn test:e2e-framework --clean --all --skip angular --skip angular12 --skip vue3 --skip web_components_typescript --skip cra --skip react
203202
no_output_timeout: 5m
204203
- store_artifacts:
205204
path: /tmp/cypress-record
@@ -214,9 +213,6 @@ jobs:
214213
clone_options: '--depth 1 --verbose'
215214
- attach_workspace:
216215
at: .
217-
- run:
218-
name: Change directory
219-
command: cd code
220216
- run:
221217
name: Running local registry
222218
command: yarn local-registry --port 6000 --open
@@ -228,7 +224,9 @@ jobs:
228224
name: Run E2E (core) tests
229225
# Do not test CRA here because it's done in PnP part
230226
# TODO: Remove `web_components_typescript` as soon as Lit 2 stable is released
231-
command: yarn test:e2e-framework vue3 angular130 angular13 angular12 web_components_typescript web_components_lit2 react react_legacy_root_api
227+
command: |
228+
cd code
229+
yarn test:e2e-framework vue3 angular130 angular13 angular12 web_components_typescript web_components_lit2 react react_legacy_root_api
232230
no_output_timeout: 5m
233231
- run:
234232
name: prep artifacts
@@ -274,26 +272,29 @@ jobs:
274272
clone_options: '--depth 1 --verbose'
275273
- attach_workspace:
276274
at: .
277-
- run:
278-
name: Change directory
279-
command: cd code
280275
- run:
281276
name: install playright
282-
command: npx playwright install
277+
command: |
278+
cd code
279+
npx playwright install
283280
- run:
284281
name: Running local registry
285-
command: yarn local-registry --port 6000 --open
282+
command: |
283+
cd code
284+
yarn local-registry --port 6000 --open
286285
background: true
287286
- run:
288287
name: Wait for registry
289288
command: yarn wait-on http://localhost:6000
290289
- run:
291290
name: set up cra repro, skip tests
292-
command: node ./lib/cli/bin/index.js repro -t cra --e2e ../cra-bench
291+
command: |
292+
cd code
293+
node ./lib/cli/bin/index.js repro -t cra --e2e ../cra-bench
293294
- run:
294295
name: Run @storybook/bench on repro
295296
command: |
296-
cd ../cra-bench
297+
cd ./cra-bench
297298
npx @storybook/bench@1.0.0--canary.11.52d1ee7.1 'echo noop' --label cra
298299
e2e-tests-pnp:
299300
executor:
@@ -305,19 +306,22 @@ jobs:
305306
clone_options: '--depth 1 --verbose'
306307
- attach_workspace:
307308
at: .
308-
- run:
309-
name: Change directory
310-
command: cd code
311309
- run:
312310
name: Running local registry
313-
command: yarn local-registry --port 6000 --open
311+
command: |
312+
cd code
313+
yarn local-registry --port 6000 --open
314314
background: true
315315
- run:
316316
name: Wait for registry
317-
command: yarn wait-on http://localhost:6000
317+
command: |
318+
cd code
319+
yarn wait-on http://localhost:6000
318320
- run:
319321
name: run e2e tests cra
320-
command: yarn test:e2e-framework --pnp cra
322+
command: |
323+
cd code
324+
yarn test:e2e-framework --pnp cra
321325
# - run:
322326
# name: run e2e tests vue
323327
# command: yarn test:e2e-framework --pnp sfcVue
@@ -340,19 +344,22 @@ jobs:
340344
clone_options: '--depth 1 --verbose'
341345
- attach_workspace:
342346
at: .
343-
- run:
344-
name: Change directory
345-
command: cd code
346347
- run:
347348
name: running example
348-
command: yarn serve-storybooks
349+
command: |
350+
cd code
351+
yarn serve-storybooks
349352
background: true
350353
- run:
351354
name: await running examples
352-
command: yarn await-serve-storybooks
355+
command: |
356+
cd code
357+
yarn await-serve-storybooks
353358
- run:
354359
name: cypress run
355-
command: yarn test:e2e-examples
360+
command: |
361+
cd code
362+
yarn test:e2e-examples
356363
- store_artifacts:
357364
path: /tmp/cypress-record
358365
destination: cypress
@@ -370,9 +377,6 @@ jobs:
370377
clone_options: '--depth 1 --verbose'
371378
- attach_workspace:
372379
at: .
373-
- run:
374-
name: Change directory
375-
command: cd code
376380
- run:
377381
name: smoke tests
378382
command: |
@@ -386,25 +390,23 @@ jobs:
386390
clone_options: '--depth 1 --verbose'
387391
- attach_workspace:
388392
at: .
389-
- run:
390-
name: Change directory
391-
command: cd code
392393
- run:
393394
name: Lint
394-
command: yarn lint
395+
command: |
396+
cd code
397+
yarn lint
395398
unit-tests:
396399
executor: sb_node_14_browsers
397400
steps:
398401
- git-shallow-clone/checkout_advanced:
399402
clone_options: '--depth 1 --verbose'
400403
- attach_workspace:
401404
at: .
402-
- run:
403-
name: Change directory
404-
command: cd code
405405
- run:
406406
name: Test
407-
command: yarn test --coverage --runInBand --ci
407+
command: |
408+
cd code
409+
yarn test --coverage --runInBand --ci
408410
- store_test_results:
409411
path: junit.xml
410412
- persist_to_workspace:
@@ -420,12 +422,11 @@ jobs:
420422
clone_options: '--depth 1 --verbose'
421423
- attach_workspace:
422424
at: .
423-
- run:
424-
name: Change directory
425-
command: cd code
426425
- run:
427426
name: Upload coverage
428-
command: yarn coverage
427+
command: |
428+
cd code
429+
yarn coverage
429430
430431
workflows:
431432
test:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
with:
3030
node-version: ${{ matrix.node_version }}
3131
cache: yarn
32-
- name: Change directory
33-
run: cd code
3432
- name: install, bootstrap
3533
run: |
34+
cd code
3635
yarn install --immutable
3736
yarn bootstrap --core
3837
- name: test
3938
run: |
39+
cd code
4040
yarn test --runInBand --ci

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ node_modules
66
dist
77
*.DS_Store
88
.cache
9+
junit.xml
910

1011
# Yarn stuff
1112
/**/.yarn/*

0 commit comments

Comments
 (0)