Merge pull request #33720 from storybookjs/norbert/ci-cost-optimizations

CI: Decrease resource-sizes to lower cost

Author: ndelangen

scripts/check/check-package.ts

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs';
 import { isAbsolute } from 'node:path';
 import { parseArgs } from 'node:util';
 
@@ -19,15 +20,17 @@ const normalizedCwd = cwd ? (isAbsolute(cwd) ? cwd : join(ROOT_DIRECTORY, cwd))
 
 const tsconfigPath = join(normalizedCwd, 'tsconfig.json');
 
-const { options, fileNames } = getTSFilesAndConfig(tsconfigPath, normalizedCwd);
-const { program, host } = getTSProgramAndHost(fileNames, options);
-
-const tsDiagnostics = getTSDiagnostics(program, normalizedCwd, host);
-if (tsDiagnostics.length > 0) {
-  console.log(tsDiagnostics);
-  process.exit(1);
-} else if (!process.env.CI) {
-  console.log('✅ No type errors');
+if (existsSync(tsconfigPath)) {
+  const { options, fileNames } = getTSFilesAndConfig(tsconfigPath, normalizedCwd);
+  const { program, host } = getTSProgramAndHost(fileNames, options);
+
+  const tsDiagnostics = getTSDiagnostics(program, normalizedCwd, host);
+  if (tsDiagnostics.length > 0) {
+    console.log(tsDiagnostics);
+    process.exit(1);
+  } else if (!process.env.CI) {
+    console.log('✅ No type errors');
+  }
 }
 
 // TODO, add more package checks here, like:

scripts/ci/common-jobs.ts

@@ -154,7 +154,7 @@ export const check = defineJob(
   (workflowName) => ({
     executor: {
       name: 'sb_node_22_classic',
-      class: 'xlarge',
+      class: 'medium+',
     },
     steps: [
       ...workflow.restoreLinux(),
@@ -184,15 +184,22 @@ export const lint = defineJob(
   () => ({
     executor: {
       name: 'sb_node_22_classic',
-      class: 'xlarge',
+      class: 'large',
     },
     steps: [
       ...workflow.restoreLinux(),
       {
         run: {
-          name: 'Lint code',
+          name: 'Lint code JS',
           working_directory: `code`,
-          command: 'yarn lint',
+          command: 'yarn lint:js',
+        },
+      },
+      {
+        run: {
+          name: 'Lint code Other',
+          working_directory: `code`,
+          command: 'yarn lint:other',
         },
       },
       {
@@ -321,7 +328,7 @@ export const benchmarkPackages = defineJob(
   () => ({
     executor: {
       name: 'sb_node_22_classic',
-      class: 'large',
+      class: 'medium+',
     },
     steps: [
       ...workflow.restoreLinux(),

scripts/ci/sandboxes.ts

@@ -33,7 +33,7 @@ function defineSandboxJob_build({
     () => ({
       executor: {
         name: 'sb_node_22_classic',
-        class: 'large',
+        class: 'medium+',
       },
       steps: [
         ...workflow.restoreLinux(),
@@ -68,11 +68,11 @@ function defineSandboxJob_dev({
       executor: options.e2e
         ? {
             name: 'sb_playwright',
-            class: 'xlarge',
+            class: 'medium+',
           }
         : {
             name: 'sb_node_22_classic',
-            class: 'large',
+            class: 'medium',
           },
       steps: [
         ...workflow.restoreLinux(),
@@ -267,7 +267,7 @@ export function defineSandboxFlow<Key extends string>(key: Key) {
     () => ({
       executor: {
         name: 'sb_playwright',
-        class: 'xlarge',
+        class: 'medium+',
       },
       steps: [
         ...workflow.restoreLinux(),
@@ -371,7 +371,7 @@ export function defineWindowsSandboxDev(sandbox: ReturnType<typeof defineSandbox
     () => ({
       executor: {
         name: 'win/default',
-        size: 'xlarge',
+        size: 'large',
         shell: 'bash.exe',
       },
       steps: [
@@ -420,7 +420,7 @@ export function defineWindowsSandboxBuild(sandbox: ReturnType<typeof defineSandb
     () => ({
       executor: {
         name: 'win/default',
-        size: 'xlarge',
+        size: 'large',
         shell: 'bash.exe',
       },
       steps: [

scripts/ci/test-storybooks.ts

@@ -23,7 +23,7 @@ export function definePortableStoryTest(directory: string) {
     () => ({
       executor: {
         name: 'sb_playwright',
-        class: 'medium',
+        class: 'medium+',
       },
       steps: [
         ...workflow.restoreLinux(),

scripts/tasks/check.ts

@@ -1,32 +1,62 @@
-import type { Task } from '../task';
-import { ROOT_DIRECTORY } from '../utils/constants';
-import { exec } from '../utils/exec';
-import { maxConcurrentTasks } from '../utils/maxConcurrentTasks';
-
-// The amount of VCPUs for the check task on CI is 4 (large resource)
-const amountOfVCPUs = 4;
+import { join } from 'node:path';
 
-const parallel = `--parallel=${process.env.CI ? amountOfVCPUs - 1 : maxConcurrentTasks}`;
+// eslint-disable-next-line depend/ban-dependencies
+import { execaCommand } from 'execa';
 
-const linkCommand = `yarn nx run-many -t check ${parallel}`;
-const nolinkCommand = `yarn nx run-many -t check -c production ${parallel}`;
+import type { Task } from '../task';
+import { CODE_DIRECTORY, ROOT_DIRECTORY } from '../utils/constants';
+import { getCodeWorkspaces } from '../utils/workspace';
 
 export const check: Task = {
   description: 'Typecheck the source code of the monorepo',
   async ready() {
     return false;
   },
-  async run(_, { dryRun, debug, link, skipCache }) {
-    const command = link ? linkCommand : nolinkCommand;
-    return exec(
-      `${command} ${skipCache || process.env.CI ? '--skip-nx-cache' : ''}`,
-      { cwd: ROOT_DIRECTORY },
-      {
-        startMessage: '🥾 Checking for TS errors',
-        errorMessage: '❌ TS errors detected',
-        dryRun,
-        debug,
+  async run(_, {}) {
+    const failed: string[] = [];
+    // const command = link ? linkCommand : nolinkCommand;
+    const workspaces = await getCodeWorkspaces();
+
+    for (const workspace of workspaces) {
+      if (workspace.location === '.') {
+        continue; // skip root directory
+      }
+      const cwd = join(CODE_DIRECTORY, workspace.location);
+      console.log('');
+      console.log('Checking ' + workspace.name + ' at ' + cwd);
+
+      let command = '';
+      if (workspace.name === '@storybook/vue3') {
+        command = `npx vue-tsc --noEmit --project ${join(cwd, 'tsconfig.json')}`;
+      } else if (workspace.name === '@storybook/svelte') {
+        command = `npx svelte-check`;
+      } else {
+        const script = join(ROOT_DIRECTORY, 'scripts', 'check', 'check-package.ts');
+        command = `yarn exec jiti ${script} --cwd ${cwd}`;
+        // command = `npx tsc --noEmit --project ${join(cwd, 'tsconfig.json')}`;
       }
-    );
+
+      const sub = execaCommand(`${command}`, {
+        cwd,
+        env: {
+          NODE_ENV: 'production',
+        },
+      });
+
+      sub.stdout?.on('data', (data) => {
+        process.stdout.write(data);
+      });
+      sub.stderr?.on('data', (data) => {
+        process.stderr.write(data);
+      });
+
+      await sub.catch(() => {
+        failed.push(workspace.name);
+      });
+    }
+
+    if (failed.length > 0) {
+      throw new Error(`Failed to check ${failed.join(', ')}`);
+    }
   },
 };