Merge branch 'main' into feat/image-and-job-status

CodeGrade · Jul 14, 2024 · 43a4fe7 · 43a4fe7
2 parents 28192f9 + dc687b7
commit 43a4fe7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/orchestrator/packages/common/src/validations/schemas/grading-job-config.ts b/orchestrator/packages/common/src/validations/schemas/grading-job-config.ts
@@ -56,7 +56,10 @@ const conditionalGradingScriptCommand = {
     on_true: {
       anyOf: [
         {
-          $ref: "https://orca-schemas.com/grading-job-config/grading-script-command",
+          type: "array",
+          items: {
+            $ref: "https://orca-schemas.com/grading-job-config/grading-script-command",
+          }
         },
         { type: "string" },
         { type: "number" },
@@ -65,7 +68,10 @@ const conditionalGradingScriptCommand = {
     on_false: {
       anyOf: [
         {
-          $ref: "https://orca-schemas.com/grading-job-config/grading-script-command",
+          type: "array",
+          items: {
+            $ref: "https://orca-schemas.com/grading-job-config/grading-script-command",
+          }
         },
         { type: "string" },
         { type: "number" },

diff --git a/worker/orca_grader/validations/schemas/bash_grading_script_command_schema.json b/worker/orca_grader/validations/schemas/bash_grading_script_command_schema.json
@@ -19,16 +19,30 @@
       "oneOf": [
         { "type": "string" },
         { "type": "number" },
-        { "$ref": "bash_grading_script_command_schema.json" },
-        { "$ref": "conditional_grading_script_comamnd_schema.json" }
+        {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              { "$ref": "bash_grading_script_command_schema.json" },
+              { "$ref": "conditional_grading_script_comamnd_schema.json" }
+            ]
+          }
+        }
       ]
     },
     "on_fail": {
       "oneOf": [
         { "type": "string" },
         { "type": "number" },
-        { "$ref": "bash_grading_script_command_schema.json" },
-        { "$ref": "conditional_grading_script_comamnd_schema.json" }
+        {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              { "$ref": "bash_grading_script_command_schema.json" },
+              { "$ref": "conditional_grading_script_comamnd_schema.json" }
+            ]
+          }
+        }
       ]
     },
     "timeout": { "type": "number" },