Skip to content

Commit

Permalink
Fix CI/CD
Browse files Browse the repository at this point in the history
  • Loading branch information
valentinpalkovic committed Nov 23, 2022
1 parent 3516f14 commit e20eb29
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 37 deletions.
72 changes: 36 additions & 36 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ parameters:
workflow:
description: Which workflow to run
type: enum
enum: ['ci', 'pr', 'merged', 'daily']
default: 'ci'
enum: ["ci", "pr", "merged", "daily"]
default: "ci"

executors:
sb_node_16_classic:
parameters:
class:
description: The Resource class
type: enum
enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
default: 'small'
enum: ["small", "medium", "medium+", "large", "xlarge"]
default: "small"
working_directory: /tmp/storybook
docker:
- image: cimg/node:16.17.1
Expand All @@ -26,8 +26,8 @@ executors:
class:
description: The Resource class
type: enum
enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
default: 'small'
enum: ["small", "medium", "medium+", "large", "xlarge"]
default: "small"
working_directory: /tmp/storybook
docker:
- image: cimg/node:16.17.1-browsers
Expand All @@ -39,8 +39,8 @@ executors:
class:
description: The Resource class
type: enum
enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
default: 'small'
enum: ["small", "medium", "medium+", "large", "xlarge"]
default: "small"
working_directory: /tmp/storybook
docker:
- image: mcr.microsoft.com/playwright:v1.28.0-focal
Expand Down Expand Up @@ -167,7 +167,7 @@ commands:
git reset --hard "$CIRCLE_SHA1"
name: Checkout code shallow
cancel-workflow-on-failure:
description: 'Cancels the entire workflow in case the previous step has failed'
description: "Cancels the entire workflow in case the previous step has failed"
steps:
- run:
name: Cancel current workflow
Expand All @@ -177,13 +177,13 @@ commands:
echo "To execute all checks locally, please run yarn ci-tests"
curl -X POST --header "Content-Type: application/json" "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}/cancel?circle-token=${WORKFLOW_CANCELER}"
report-workflow-on-failure:
description: 'Reports failures to discord'
description: "Reports failures to discord"
parameters:
template:
description: |
Which template to report in discord. Applicable for parallel sandbox jobs
type: string
default: 'none'
default: "none"
steps:
- run:
when: on_fail
Expand All @@ -199,7 +199,7 @@ jobs:
name: sb_node_16_classic
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- run:
name: Prettier
command: |
Expand All @@ -212,7 +212,7 @@ jobs:
name: sb_node_16_classic
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- restore_cache:
name: Restore Yarn cache
keys:
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
working_directory: /tmp/storybook
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
working_directory: /tmp/storybook
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:
name: sb_node_16_classic
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -351,7 +351,7 @@ jobs:
name: sb_node_16_classic
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -365,7 +365,7 @@ jobs:
executor: sb_node_16_browsers
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -383,7 +383,7 @@ jobs:
name: sb_node_16_browsers
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -405,7 +405,7 @@ jobs:
name: sb_node_16_browsers
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -419,7 +419,7 @@ jobs:
class: medium+
name: sb_node_16_browsers
environment:
NODE_OPTIONS: --max_old_space_size=6144
NODE_OPTIONS: --max_old_space_size=6144
steps:
# switched this to the CircleCI helper to get the full git history for TurboSnap
- checkout
Expand All @@ -446,7 +446,7 @@ jobs:
parallelism: << parameters.parallelism >>
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -471,7 +471,7 @@ jobs:
parallelism: << parameters.parallelism >>
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -492,7 +492,7 @@ jobs:
parallelism: << parameters.parallelism >>
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand All @@ -517,7 +517,7 @@ jobs:
parallelism: << parameters.parallelism >>
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand Down Expand Up @@ -558,7 +558,7 @@ jobs:
parallelism: << parameters.parallelism >>
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
clone_options: "--depth 1 --verbose"
- attach_workspace:
at: .
- run:
Expand Down Expand Up @@ -689,23 +689,23 @@ workflows:
requires:
- build
- create-sandboxes:
parallelism: 16
parallelism: 15
requires:
- build
- build-sandboxes:
parallelism: 16
parallelism: 15
requires:
- create-sandboxes
- test-runner-sandboxes:
parallelism: 16
parallelism: 15
requires:
- build-sandboxes
- chromatic-sandboxes:
parallelism: 16
parallelism: 15
requires:
- build-sandboxes
- e2e-sandboxes:
parallelism: 16
parallelism: 15
requires:
- build-sandboxes
daily:
Expand All @@ -714,25 +714,25 @@ workflows:
jobs:
- build
- create-sandboxes:
parallelism: 26
parallelism: 25
requires:
- build
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
parallelism: 26
parallelism: 25
requires:
- create-sandboxes
- test-runner-sandboxes:
parallelism: 26
parallelism: 25
requires:
- build-sandboxes
- chromatic-sandboxes:
parallelism: 26
parallelism: 25
requires:
- build-sandboxes
- e2e-sandboxes:
parallelism: 26
parallelism: 25
requires:
- build-sandboxes
1 change: 0 additions & 1 deletion code/lib/cli/src/repro-templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ export const merged: TemplateKey[] = [
...pr,
'react-webpack/18-ts',
'react-webpack/17-ts',
'angular-cli/default-ts',
'angular-cli/14-ts',
'angular-cli/13-ts',
'preact-webpack5/default-ts',
Expand Down

0 comments on commit e20eb29

Please sign in to comment.