From cc8e2738ef6d9e0120ef5a113a3b1544b0f8b63f Mon Sep 17 00:00:00 2001
From: Ethan Chiu <ethanchewy@github.com>
Date: Thu, 23 Jul 2020 12:22:38 -0400
Subject: [PATCH] Add 'uses' and 'with' to action yaml and change names to be
 consistent with workflow yaml

---
 src/Runner.Worker/action_yaml.json | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/Runner.Worker/action_yaml.json b/src/Runner.Worker/action_yaml.json
index a36a900bc..2fa2863c2 100644
--- a/src/Runner.Worker/action_yaml.json
+++ b/src/Runner.Worker/action_yaml.json
@@ -123,7 +123,13 @@
                 "item-type": "composite-step"
             }
         },
-        "composite-step": {
+        "steps-item": {
+            "one-of": [
+                "run-step",
+                "regular-step"
+            ]
+        },
+        "run-step": {
             "mapping": {
                 "properties": {
                     "name": "string-steps-context",
@@ -132,12 +138,26 @@
                         "type": "string-steps-context",
                         "required": true
                     },
-                    "env": "step-env",
+                    "uses": "env": "step-env",
                     "working-directory": "string-steps-context",
                     "shell": "string-steps-context"
                 }
             }
         },
+        "regular-step": {
+            "mapping": {
+                "properties": {
+                    "name": "string-steps-context",
+                    "id": "non-empty-string",
+                    "uses": {
+                        "type": "non-empty-string",
+                        "required": true
+                    },
+                    "with": "step-with",
+                    "env": "step-env"
+                }
+            }
+        },
         "container-runs-context": {
             "context": [
                 "inputs"
@@ -203,4 +223,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file