fix: Runner build if it's a part of the project

Farfetch · Sep 16, 2020 · f4c8b42 · f4c8b42
1 parent 7a3c429
commit f4c8b42
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 30 deletions.
diff --git a/core/dependency-graph/src/DependencyGraph.ts b/core/dependency-graph/src/DependencyGraph.ts
@@ -273,10 +273,16 @@ export class Graph<T = string> {
         this.addNode(node);
       }
       for (const [key, nodes] of graph.inEdges) {
-        this.inEdges.set(key, new Set(nodes));
+        this.inEdges.set(
+          key,
+          new Set([...(this.inEdges.get(key) ?? []), ...nodes])
+        );
       }
       for (const [key, nodes] of graph.outEdges) {
-        this.outEdges.set(key, new Set(nodes));
+        this.outEdges.set(
+          key,
+          new Set([...(this.outEdges.get(key) ?? []), ...nodes])
+        );
       }
     }
   }

diff --git a/core/garment/src/garment.ts b/core/garment/src/garment.ts
@@ -11,7 +11,9 @@ import {
   RunnerMeta,
   validateOptions,
   file,
-  InputFn
+  InputFn,
+  getSchema,
+  renderOptions
 } from '@garment/runner';
 import {
   Action,
@@ -357,7 +359,7 @@ async function garmentFromWorkspace(
               const rootDir =
                 subscription.type === 'glob'
                   ? subscription.input.rootDir
-                  : subscription.baseDir
+                  : subscription.baseDir;
 
               const files = Object.keys(changes)
                 .map(changedFilePath =>
@@ -556,7 +558,12 @@ async function garmentFromWorkspace(
           const context = getRunnerContext({
             workspace,
             project,
-            options,
+            options: renderOptions({
+              options,
+              workspace,
+              project,
+              schema: getSchema(runner)
+            }),
             outputDir: tempOutputDir,
             cacheProvider,
             defaultCacheKeys: [runner.name, runner.version],
@@ -968,9 +975,15 @@ async function garmentFromWorkspace(
         });
       }
       const { batch } = batchesByRunner.get(action.runner.handlerPath)!;
+
       batch.push({
         project: action.project,
-        options: action.options
+        options: renderOptions({
+          options: action.options,
+          workspace,
+          project: action.project,
+          schema: getSchema(action.runner)
+        })
       });
     }
     for (const { runner, batch } of batchesByRunner.values()) {

diff --git a/core/scheduler/src/getActionGraph.ts b/core/scheduler/src/getActionGraph.ts
@@ -1,11 +1,5 @@
 import { Graph } from '@garment/dependency-graph';
-import {
-  getRunnerMeta,
-  getSchema,
-  renderOptions,
-  requireQuery,
-  RunnerMeta
-} from '@garment/runner';
+import { getRunnerMeta, requireQuery, RunnerMeta } from '@garment/runner';
 import {
   Project,
   ResolvedTaskConfig,
@@ -14,9 +8,9 @@ import {
   Workspace
 } from '@garment/workspace';
 import * as multimatch from 'multimatch';
+import * as objectHash from 'object-hash';
 import * as Path from 'path';
 import { Action, Input, RunnerAction } from './Action';
-import * as objectHash from 'object-hash';
 
 import globParent = require('glob-parent');
 
@@ -141,20 +135,6 @@ export function getActionGraph(opts: GetActionGraphOptions) {
             restRunners[runner]
           );
 
-          let transformedOptions = normalizedOptions;
-          let runnerProject = workspace.projects.getByPath(
-            runnerMeta.handlerPath
-          );
-          if (!(runnerProject && runnerProject.tasks['build'])) {
-            const schema = getSchema(runnerMeta);
-            transformedOptions = renderOptions({
-              options: normalizedOptions,
-              workspace,
-              project,
-              schema
-            });
-          }
-
           let resolvedInput: Input | undefined;
 
           if (typeof input === 'string') {
@@ -237,7 +217,7 @@ export function getActionGraph(opts: GetActionGraphOptions) {
             watch: skipWatch ? false : watch,
             lifecycle,
             project,
-            options: { ...normalizedOptions, ...transformedOptions },
+            options: normalizedOptions,
             output: output
               ? arrayfy(output).map(_ => project.resolvePathTemplate(_))
               : undefined,
@@ -285,7 +265,7 @@ export function getActionGraph(opts: GetActionGraphOptions) {
             const runnerProject = workspace.projects.getByPath(
               addedAction.runner.handlerPath
             );
-            if (runnerProject) {
+            if (runnerProject && buildDependencies !== false) {
               // We need to first build the runner
               const runnerActionGraph = getActionGraphByTask(
                 'build',