Merge branch 'main' into elbrenn/secret-complete

workflow-parser/src/templates/template-reader.ts

@@ -203,14 +203,15 @@ class TemplateReader {
             );
 
       // Duplicate
-      const upperKey = nextKey.value.toUpperCase();
-      if (upperKeys[upperKey]) {
-        this._context.error(nextKey, `'${nextKey.value}' is already defined`);
-        this.skipValue();
-        continue;
+      if (nextKey.value) {
+        const upperKey = nextKey.value.toUpperCase();
+        if (upperKeys[upperKey]) {
+          this._context.error(nextKey, `'${nextKey.value}' is already defined`);
+          this.skipValue();
+          continue;
+        }
+        upperKeys[upperKey] = true;
       }
-      upperKeys[upperKey] = true;
-
       // Well known
       const nextPropertyDef = this._schema.matchPropertyAndFilter(mappingDefinitions, nextKey.value);
       if (nextPropertyDef) {
@@ -339,13 +340,15 @@ class TemplateReader {
             );
 
       // Duplicate
-      const upperKey = nextKey.value.toUpperCase();
-      if (upperKeys[upperKey]) {
-        this._context.error(nextKey, `'${nextKey.value}' is already defined`);
-        this.skipValue();
-        continue;
+      if (nextKey.value) {
+        const upperKey = nextKey.value.toUpperCase();
+        if (upperKeys[upperKey]) {
+          this._context.error(nextKey, `'${nextKey.value}' is already defined`);
+          this.skipValue();
+          continue;
+        }
+        upperKeys[upperKey] = true;
       }
-      upperKeys[upperKey] = true;
 
       // Validate
       this.validate(nextKey, keyDefinition);
@@ -443,7 +446,7 @@ class TemplateReader {
 
   private parseScalar(token: LiteralToken, definitionInfo: DefinitionInfo): ScalarToken {
     // Not a string
-    if (!isString(token)) {
+    if (!isString(token) || !token.value) {
       return token;
     }
 

workflow-parser/src/workflow-v1.0.json

@@ -2044,8 +2044,7 @@
           "continue-on-error": "step-continue-on-error",
           "timeout-minutes": "step-timeout-minutes",
           "uses": {
-            "description": "Selects an action to run as part of a step in your job. An action is a reusable unit of code. You can use an action defined in the same repository as the workflow, a public repository, or in a published Docker container image.",
-            "type": "non-empty-string",
+            "type": "step-uses",
             "required": true
           },
           "with": "step-with",
@@ -2053,6 +2052,12 @@
         }
       }
     },
+    "step-uses": {
+      "description": "Selects an action to run as part of a step in your job. An action is a reusable unit of code. You can use an action defined in the same repository as the workflow, a public repository, or in a published Docker container image.",
+      "string": {
+        "require-non-empty": true
+      }
+    },
     "step-continue-on-error": {
       "context": [
         "github",