Merge pull request #1229 from polywrap/fetsorn/1228-validation-path

fix: validation script path should be relative to workflow manifest
polywrap · Sep 10, 2022 · 23f028a · 23f028a
2 parents 453c28f + 8ce3fe7
commit 23f028a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/cli/src/commands/run.ts b/packages/cli/src/commands/run.ts
@@ -61,8 +61,11 @@ export const run: Command = {
   },
 };
 
-function loadValidationScript(cueFilepath: string): string {
-  cueFilepath = path.resolve(cueFilepath);
+function loadValidationScript(
+  manifestPath: string,
+  cueFilepath: string
+): string {
+  cueFilepath = path.join(path.dirname(manifestPath), cueFilepath);
 
   if (!fs.existsSync(cueFilepath)) {
     console.error(
@@ -83,7 +86,7 @@ const _run = async (options: WorkflowCommandOptions) => {
   const manifestPath = path.resolve(manifest);
   const workflow = loadWorkflowManifest(manifestPath);
   const validationScript = workflow.validation
-    ? loadValidationScript(workflow.validation)
+    ? loadValidationScript(manifestPath, workflow.validation)
     : undefined;
 
   const workflowOutput: (JobResult & { id: string })[] = [];

diff --git a/packages/templates/wasm/assemblyscript/polywrap.test.yaml b/packages/templates/wasm/assemblyscript/polywrap.test.yaml
@@ -1,6 +1,6 @@
 name: template-wasm-rs
 format: 0.1
-validation: "./workflows/validation.cue"
+validation: "./workflows/validator.cue"
 jobs:
   sampleMethod:
     steps: