Skip to content

Commit

Permalink
Merge pull request #15556 from storybookjs/fix-ci
Browse files Browse the repository at this point in the history
Build: Fix `publish` step on CircleCI
  • Loading branch information
shilman committed Jul 13, 2021
2 parents e7a0016 + c3ea5c7 commit 5085073
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Expand Up @@ -198,7 +198,7 @@ jobs:
command: yarn test:e2e-framework --clean --all --skip angular11 --skip angular --skip vue3 --skip web_components_typescript --skip cra
no_output_timeout: 5m
- store_artifacts:
path: /tmp/storybook/cypress
path: /tmp/cypress-record
destination: cypress
e2e-tests-core:
executor:
Expand All @@ -224,7 +224,7 @@ jobs:
command: yarn test:e2e-framework vue3 angular angular11 web_components_typescript web_components_lit2
no_output_timeout: 5m
- store_artifacts:
path: /tmp/storybook/cypress
path: /tmp/cypress-record
destination: cypress
cra-bench:
executor:
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
name: run e2e tests
command: yarn test:e2e-framework --pnp sfcVue cra
- store_artifacts:
path: /tmp/storybook/cypress
path: /tmp/cypress-record
destination: cypress
e2e-tests-examples:
executor:
Expand All @@ -293,7 +293,7 @@ jobs:
name: cypress run
command: yarn test:e2e-examples
- store_artifacts:
path: /tmp/storybook/cypress
path: /tmp/cypress-record
destination: cypress
smoke-tests:
executor:
Expand Down
Expand Up @@ -14,7 +14,7 @@ Object {
},
},
"type": Object {
"name": "void",
"name": "string",
},
},
"_value": Object {
Expand All @@ -30,7 +30,7 @@ Object {
},
},
"type": Object {
"name": "void",
"name": "string",
},
},
"accent": Object {
Expand Down Expand Up @@ -129,7 +129,7 @@ Object {
},
},
"type": Object {
"name": "void",
"name": "string",
},
},
"isDisabled": Object {
Expand Down Expand Up @@ -225,7 +225,7 @@ Object {
},
},
"type": Object {
"name": "void",
"name": "object",
},
},
"protectedMethod": Object {
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/src/frameworks/angular/compodoc.ts
Expand Up @@ -190,7 +190,7 @@ export const extractArgTypesFromData = (componentData: Class | Directive | Injec
const section = mapItemToSection(key, item);
const defaultValue = isMethod(item) ? undefined : extractDefaultValue(item as Property);
const type =
isMethod(item) || section !== 'inputs'
isMethod(item) || (section !== 'inputs' && section !== 'properties')
? { name: 'void' }
: extractType(item as Property, defaultValue);
const action = section === 'outputs' ? { action: item.name } : {};
Expand Down
6 changes: 3 additions & 3 deletions scripts/run-e2e.ts
Expand Up @@ -53,10 +53,10 @@ const serveStorybook = async ({ cwd }: Options, port: string) => {
return serve(staticDirectory, port);
};

const runCypress = async (location: string) => {
const runCypress = async (location: string, name: string) => {
const cypressCommand = openCypressInUIMode ? 'open' : 'run';
await exec(
`yarn cypress ${cypressCommand} --config pageLoadTimeout=4000,execTimeout=4000,taskTimeout=4000,responseTimeout=4000,integrationFolder="cypress/generated" --env location="${location}"`,
`yarn cypress ${cypressCommand} --config pageLoadTimeout=4000,execTimeout=4000,taskTimeout=4000,responseTimeout=4000,defaultCommandTimeout=4000,integrationFolder="cypress/generated",videosFolder="/tmp/cypress-record/${name}" --env location="${location}"`,
{ cwd: rootDir },
{
startMessage: `🤖 Running Cypress tests`,
Expand Down Expand Up @@ -115,7 +115,7 @@ const runTests = async ({ name, ...rest }: Parameters) => {
logger.log();

try {
await runCypress('http://localhost:4000');
await runCypress('http://localhost:4000', name);
logger.info(`🎉 Storybook is working great with ${name}!`);
} catch (e) {
logger.info(`🥺 Storybook has some issues with ${name}!`);
Expand Down
4 changes: 0 additions & 4 deletions scripts/verdaccio.yaml
Expand Up @@ -59,10 +59,6 @@ packages:
access: $all
publish: $all
proxy: npmjs
'@storybook/addon-measure':
access: $all
publish: $all
proxy: npmjs

# storybook packages are NOT proxied to global registry
# allowing us to republish any version during tests
Expand Down

0 comments on commit 5085073

Please sign in to comment.