fix(workspace-plugin): properly resolve isCi on ADO (#33165)

microsoft · Oct 29, 2024 · 2953c5d · 2953c5d
1 parent e1644c3
commit 2953c5d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/tools/workspace-plugin/src/executors/generate-api/executor.spec.ts b/tools/workspace-plugin/src/executors/generate-api/executor.spec.ts
@@ -12,6 +12,7 @@ import { type TsConfig } from '../../types';
 
 import { type GenerateApiExecutorSchema } from './schema';
 import executor from './executor';
+import { isCI } from './lib/shared';
 
 // =========== mocks START
 import { execSync } from 'node:child_process';
@@ -169,8 +170,11 @@ describe('GenerateApi Executor', () => {
       skipLibCheck: false,
     });
     expect(extractorConfig.skipLibCheck).toBe(false);
+
+    const actualLocalBuildValue = isCI() ? false : true;
+
     expect(extractorArgs).toEqual({
-      localBuild: true,
+      localBuild: actualLocalBuildValue,
       showDiagnostics: false,
       showVerboseMessages: true,
     });

diff --git a/tools/workspace-plugin/src/executors/generate-api/executor.ts b/tools/workspace-plugin/src/executors/generate-api/executor.ts
@@ -8,6 +8,7 @@ import { Extractor, ExtractorConfig, type IConfigFile } from '@microsoft/api-ext
 import type { GenerateApiExecutorSchema } from './schema';
 import type { PackageJson, TsConfig } from '../../types';
 import { measureEnd, measureStart } from '../../utils';
+import { isCI } from './lib/shared';
 
 const runExecutor: PromiseExecutor<GenerateApiExecutorSchema> = async (schema, context) => {
   measureStart('GenerateApiExecutor');
@@ -67,14 +68,6 @@ function normalizeOptions(schema: GenerateApiExecutorSchema, context: ExecutorCo
     tsConfigPathForCompilation: tsConfigPathForCompilation.result!,
     packageJsonPath,
   };
-
-  function isCI() {
-    return (
-      (process.env.CI && process.env.CI !== 'false') ||
-      process.env.TF_BUILD === 'true' ||
-      process.env.GITHUB_ACTIONS === 'true'
-    );
-  }
 }
 
 function generateTypeDeclarations(options: NormalizedOptions) {

diff --git a/tools/workspace-plugin/src/executors/generate-api/lib/shared.ts b/tools/workspace-plugin/src/executors/generate-api/lib/shared.ts
@@ -0,0 +1,7 @@
+export function isCI() {
+  return (
+    (process.env.CI && process.env.CI !== 'false') ||
+    (process.env.TF_BUILD && process.env.TF_BUILD.toLowerCase() === 'true') ||
+    process.env.GITHUB_ACTIONS === 'true'
+  );
+}