From 25f4fd1b5fec908829d2da20f4009f1d8074ef12 Mon Sep 17 00:00:00 2001
From: Mattias Cibien <mattiascibien@users.noreply.github.com>
Date: Wed, 27 Oct 2021 16:24:24 +0200
Subject: [PATCH 01/11] Fix dotnet-desktop template

Removed environment variable which is not currently used and makes the build fail
---
 ci/dotnet-desktop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/dotnet-desktop.yml b/ci/dotnet-desktop.yml
index 0635779..c22b998 100644
--- a/ci/dotnet-desktop.yml
+++ b/ci/dotnet-desktop.yml
@@ -105,7 +105,7 @@ jobs:
 
     # Remove the pfx
     - name: Remove the pfx
-      run: Remove-Item -path $env:Wap_Project_Directory\$env:Signing_Certificate
+      run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx
 
     # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
     - name: Upload build artifacts

From 394301af94ed4c4a052d067ef69a71885bc0a297 Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:11:33 +0000
Subject: [PATCH 02/11] Adding folder category check

---
 script/validate-data/index.ts      | 17 ++++++++++++-----
 script/validate-data/settings.json | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 7dce3d1..6669b34 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env npx ts-node
 import { promises as fs } from "fs";
 import { safeLoad } from "js-yaml";
-import { basename, extname, join } from "path";
+import { basename, extname, join, dirname } from "path";
 import { Validator as validator } from "jsonschema";
 import { endGroup, error, info, setFailed, startGroup } from '@actions/core';
 
@@ -40,7 +40,7 @@ const propertiesSchema = {
   }
 }
 
-async function checkWorkflows(folders: string[], allowed_categories: string[]): Promise<WorkflowWithErrors[]> {
+async function checkWorkflows(folders: string[], allowed_categories: string[], folder_category_map: object[]): Promise<WorkflowWithErrors[]> {
   const result: WorkflowWithErrors[] = []
   const workflow_template_names = new Set()
   for (const folder of folders) {
@@ -55,7 +55,7 @@ async function checkWorkflows(folders: string[], allowed_categories: string[]):
         const workflowFilePath = join(folder, e.name);
         const propertiesFilePath = join(folder, "properties", `${fileType}.properties.json`)
 
-        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath, allowed_categories);
+        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath, allowed_categories, folder_category_map);
         if(workflowWithErrors.name && workflow_template_names.size == workflow_template_names.add(workflowWithErrors.name).size) {
           workflowWithErrors.errors.push(`Workflow template name "${workflowWithErrors.name}" already exists`) 
         }
@@ -69,7 +69,7 @@ async function checkWorkflows(folders: string[], allowed_categories: string[]):
   return result;
 }
 
-async function checkWorkflow(workflowPath: string, propertiesPath: string, allowed_categories: string[]): Promise<WorkflowWithErrors> {
+async function checkWorkflow(workflowPath: string, propertiesPath: string, allowed_categories: string[], folder_category_map: object[]): Promise<WorkflowWithErrors> {
   let workflowErrors: WorkflowWithErrors = {
     id: workflowPath,
     name: null,
@@ -104,10 +104,17 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
       }
       
     }
+    var directoryName = dirname(workflowPath)
+    var folder_category = folder_category_map.find( folder_category => folder_category["name"] == directoryName)["category"]
     if (!workflowPath.endsWith("blank.yml") && (!properties.categories || 
       !properties.categories.some(category => allowed_categories.some(ac => ac.toLowerCase() == category.toLowerCase())))) {
       workflowErrors.errors.push(`Workflow does not contain at least one allowed category - ${allowed_categories}`)
     }
+
+    if(properties.categories && !properties.categories.some(category => category.toLowerCase() == folder_category.toLowerCase())) {
+      workflowErrors.errors.push(`Either workflow is not added to the correct directory or category specified is wrong. Allowed category for ${basename(directoryName)} directory is ${folder_category}`)
+    }
+    
   } catch (e) {
     workflowErrors.errors.push(e.toString())
   }
@@ -118,7 +125,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
   try {
     const settings = require("./settings.json");
     const erroredWorkflows = await checkWorkflows(
-      settings.folders, settings.allowed_categories
+      settings.folders, settings.allowed_categories, settings.folder_category_map
     )
 
     if (erroredWorkflows.length > 0) {
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index ce89e36..ab1ada3 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -10,5 +10,23 @@
     "Deployment",
     "Code Scanning",
     "Automation"
+  ],
+  "folder_category_map": [
+    {
+      "name":  "../../ci",
+      "category": "Continuous integration" 
+    },
+    {
+      "name": "../../automation",
+      "category": "Automation"
+    },
+    { 
+      "name": "../../deployments",
+      "category": "Deployment"
+    },
+    { 
+      "name": "../../code-scanning",
+      "category": "Code Scanning"
+    }
   ]
 }
\ No newline at end of file

From aafd23c138797490f77148df749cb66c609c825a Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Thu, 24 Feb 2022 10:26:04 +0000
Subject: [PATCH 03/11] review comments

---
 script/validate-data/index.ts      | 21 ++++++++++-----------
 script/validate-data/settings.json |  8 +-------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 6669b34..c3b6fa9 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -69,7 +69,7 @@ async function checkWorkflows(folders: string[], allowed_categories: string[], f
   return result;
 }
 
-async function checkWorkflow(workflowPath: string, propertiesPath: string, allowed_categories: string[], folder_category_map: object[]): Promise<WorkflowWithErrors> {
+async function checkWorkflow(workflowPath: string, propertiesPath: string, allowed_categories: string[], directory_category_map: object[]): Promise<WorkflowWithErrors> {
   let workflowErrors: WorkflowWithErrors = {
     id: workflowPath,
     name: null,
@@ -105,16 +105,15 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
       
     }
     var directoryName = dirname(workflowPath)
-    var folder_category = folder_category_map.find( folder_category => folder_category["name"] == directoryName)["category"]
-    if (!workflowPath.endsWith("blank.yml") && (!properties.categories || 
-      !properties.categories.some(category => allowed_categories.some(ac => ac.toLowerCase() == category.toLowerCase())))) {
-      workflowErrors.errors.push(`Workflow does not contain at least one allowed category - ${allowed_categories}`)
+    var directory_category = directory_category_map.find( folder_category => folder_category["name"] == directoryName)["category"]
+    if (!workflowPath.endsWith("blank.yml") && ((!properties.categories || properties.categories.length == 0 )|| 
+      properties.categories[0].toLowerCase() !== directory_category.toLowerCase())) {
+      if(!properties.categories || properties.categories.length == 0) {
+        workflowErrors.errors.push(`Workflow categories cannot be null or empty`)
+      } else {
+        workflowErrors.errors.push(`The first category in properties.json categories must be "${directory_category}" for ${basename(directoryName)} directory workflow.`)
+      }
     }
-
-    if(properties.categories && !properties.categories.some(category => category.toLowerCase() == folder_category.toLowerCase())) {
-      workflowErrors.errors.push(`Either workflow is not added to the correct directory or category specified is wrong. Allowed category for ${basename(directoryName)} directory is ${folder_category}`)
-    }
-    
   } catch (e) {
     workflowErrors.errors.push(e.toString())
   }
@@ -125,7 +124,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
   try {
     const settings = require("./settings.json");
     const erroredWorkflows = await checkWorkflows(
-      settings.folders, settings.allowed_categories, settings.folder_category_map
+      settings.folders, settings.allowed_categories, settings.directory_category_map
     )
 
     if (erroredWorkflows.length > 0) {
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index ab1ada3..2dd3898 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -5,13 +5,7 @@
     "../../deployments",
     "../../code-scanning"
   ],
-  "allowed_categories" : [
-    "Continuous integration",
-    "Deployment",
-    "Code Scanning",
-    "Automation"
-  ],
-  "folder_category_map": [
+  "directory_category_map": [
     {
       "name":  "../../ci",
       "category": "Continuous integration" 

From ac7b3362da33824992eea1a04c15dccb84799abe Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Fri, 4 Mar 2022 05:59:55 +0000
Subject: [PATCH 04/11] removing unused variables

---
 script/validate-data/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index c3b6fa9..e54b6c1 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -40,7 +40,7 @@ const propertiesSchema = {
   }
 }
 
-async function checkWorkflows(folders: string[], allowed_categories: string[], folder_category_map: object[]): Promise<WorkflowWithErrors[]> {
+async function checkWorkflows(folders: string[], folder_category_map: object[]): Promise<WorkflowWithErrors[]> {
   const result: WorkflowWithErrors[] = []
   const workflow_template_names = new Set()
   for (const folder of folders) {
@@ -55,7 +55,7 @@ async function checkWorkflows(folders: string[], allowed_categories: string[], f
         const workflowFilePath = join(folder, e.name);
         const propertiesFilePath = join(folder, "properties", `${fileType}.properties.json`)
 
-        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath, allowed_categories, folder_category_map);
+        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath, folder_category_map);
         if(workflowWithErrors.name && workflow_template_names.size == workflow_template_names.add(workflowWithErrors.name).size) {
           workflowWithErrors.errors.push(`Workflow template name "${workflowWithErrors.name}" already exists`) 
         }
@@ -69,7 +69,7 @@ async function checkWorkflows(folders: string[], allowed_categories: string[], f
   return result;
 }
 
-async function checkWorkflow(workflowPath: string, propertiesPath: string, allowed_categories: string[], directory_category_map: object[]): Promise<WorkflowWithErrors> {
+async function checkWorkflow(workflowPath: string, propertiesPath: string, directory_category_map: object[]): Promise<WorkflowWithErrors> {
   let workflowErrors: WorkflowWithErrors = {
     id: workflowPath,
     name: null,
@@ -124,7 +124,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
   try {
     const settings = require("./settings.json");
     const erroredWorkflows = await checkWorkflows(
-      settings.folders, settings.allowed_categories, settings.directory_category_map
+      settings.folders, settings.directory_category_map
     )
 
     if (erroredWorkflows.length > 0) {

From c6cf518c753c35074eb20e53d641c91e6d87528d Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Fri, 4 Mar 2022 06:28:56 +0000
Subject: [PATCH 05/11] reaming directory to folder and added creator check for
 deployment templates

---
 script/validate-data/index.ts      | 17 +++++++++++------
 script/validate-data/settings.json |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index e54b6c1..da4d2d8 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -14,6 +14,7 @@ interface WorkflowWithErrors {
 interface WorkflowProperties {
   name: string;
   description: string;
+  creator: string;
   iconName: string;
   categories: string[];
 }
@@ -69,7 +70,7 @@ async function checkWorkflows(folders: string[], folder_category_map: object[]):
   return result;
 }
 
-async function checkWorkflow(workflowPath: string, propertiesPath: string, directory_category_map: object[]): Promise<WorkflowWithErrors> {
+async function checkWorkflow(workflowPath: string, propertiesPath: string, folder_category_map: object[]): Promise<WorkflowWithErrors> {
   let workflowErrors: WorkflowWithErrors = {
     id: workflowPath,
     name: null,
@@ -104,16 +105,20 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, direc
       }
       
     }
-    var directoryName = dirname(workflowPath)
-    var directory_category = directory_category_map.find( folder_category => folder_category["name"] == directoryName)["category"]
+    var folderName = dirname(workflowPath)
+    var folder_category = folder_category_map.find( folder_category => folder_category["name"] == folderName)["category"]
     if (!workflowPath.endsWith("blank.yml") && ((!properties.categories || properties.categories.length == 0 )|| 
-      properties.categories[0].toLowerCase() !== directory_category.toLowerCase())) {
+      properties.categories[0].toLowerCase() !== folder_category.toLowerCase())) {
       if(!properties.categories || properties.categories.length == 0) {
         workflowErrors.errors.push(`Workflow categories cannot be null or empty`)
       } else {
-        workflowErrors.errors.push(`The first category in properties.json categories must be "${directory_category}" for ${basename(directoryName)} directory workflow.`)
+        workflowErrors.errors.push(`The first category in properties.json categories must be "${folder_category}" for ${basename(folderName)} folder workflow.`)
       }
     }
+
+    if(folder_category.toLowerCase() == 'deployment' && !properties.creator) {
+      workflowErrors.errors.push(`The "creator" in properties.json must be present.`)
+    }
   } catch (e) {
     workflowErrors.errors.push(e.toString())
   }
@@ -124,7 +129,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, direc
   try {
     const settings = require("./settings.json");
     const erroredWorkflows = await checkWorkflows(
-      settings.folders, settings.directory_category_map
+      settings.folders, settings.folder_category_map
     )
 
     if (erroredWorkflows.length > 0) {
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index 2dd3898..7d3ecfe 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -5,7 +5,7 @@
     "../../deployments",
     "../../code-scanning"
   ],
-  "directory_category_map": [
+  "folder_category_map": [
     {
       "name":  "../../ci",
       "category": "Continuous integration" 

From 002e1a441e4ada04aca6da6f20a4b1fd079548ed Mon Sep 17 00:00:00 2001
From: Matt Moore <mattmoor@chainguard.dev>
Date: Mon, 6 Dec 2021 12:04:44 -0800
Subject: [PATCH 06/11] Support uppercase repository names with cosign.

My previous PR didn't properly handle uppercase usernames (or repository names) when signing container images with `cosign`.

It seems that the `docker buildx --push` doesn't like this either, but it's passed the output of the `docker/metadata-action` which seems to lowercase things.

Fixes: https://github.com/actions/starter-workflows/issues/1293

Signed-off-by: Matt Moore <mattmoor@chainguard.dev>
---
 ci/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/docker-publish.yml b/ci/docker-publish.yml
index 977635a..ee2ec63 100644
--- a/ci/docker-publish.yml
+++ b/ci/docker-publish.yml
@@ -90,4 +90,4 @@ jobs:
           COSIGN_EXPERIMENTAL: "true"
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
-        run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
+        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

From 5aba2798002b169baefab50eb36b19f8d4649fe0 Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Mon, 2 May 2022 06:08:29 +0000
Subject: [PATCH 07/11] addressing review comments

---
 script/validate-data/index.ts      | 20 ++++++++++----------
 script/validate-data/settings.json | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index da4d2d8..5e6327a 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -41,7 +41,7 @@ const propertiesSchema = {
   }
 }
 
-async function checkWorkflows(folders: string[], folder_category_map: object[]): Promise<WorkflowWithErrors[]> {
+async function checkWorkflows(folders: string[], allowed_categories: object[]): Promise<WorkflowWithErrors[]> {
   const result: WorkflowWithErrors[] = []
   const workflow_template_names = new Set()
   for (const folder of folders) {
@@ -56,7 +56,7 @@ async function checkWorkflows(folders: string[], folder_category_map: object[]):
         const workflowFilePath = join(folder, e.name);
         const propertiesFilePath = join(folder, "properties", `${fileType}.properties.json`)
 
-        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath, folder_category_map);
+        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath, allowed_categories);
         if(workflowWithErrors.name && workflow_template_names.size == workflow_template_names.add(workflowWithErrors.name).size) {
           workflowWithErrors.errors.push(`Workflow template name "${workflowWithErrors.name}" already exists`) 
         }
@@ -70,7 +70,7 @@ async function checkWorkflows(folders: string[], folder_category_map: object[]):
   return result;
 }
 
-async function checkWorkflow(workflowPath: string, propertiesPath: string, folder_category_map: object[]): Promise<WorkflowWithErrors> {
+async function checkWorkflow(workflowPath: string, propertiesPath: string, allowed_categories: object[]): Promise<WorkflowWithErrors> {
   let workflowErrors: WorkflowWithErrors = {
     id: workflowPath,
     name: null,
@@ -105,14 +105,14 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, folde
       }
       
     }
-    var folderName = dirname(workflowPath)
-    var folder_category = folder_category_map.find( folder_category => folder_category["name"] == folderName)["category"]
-    if (!workflowPath.endsWith("blank.yml") && ((!properties.categories || properties.categories.length == 0 )|| 
-      properties.categories[0].toLowerCase() !== folder_category.toLowerCase())) {
+    var path = dirname(workflowPath)
+    var folder_category = allowed_categories.find( category => category["path"] == path)["name"]
+    if (!workflowPath.endsWith("blank.yml")) {
       if(!properties.categories || properties.categories.length == 0) {
         workflowErrors.errors.push(`Workflow categories cannot be null or empty`)
-      } else {
-        workflowErrors.errors.push(`The first category in properties.json categories must be "${folder_category}" for ${basename(folderName)} folder workflow.`)
+      } 
+      else if(properties.categories[0].toLowerCase() !== folder_category.toLowerCase()) {
+        workflowErrors.errors.push(`The first category in properties.json categories must be "${folder_category}" for workflow in ${basename(path)} folder.`)
       }
     }
 
@@ -129,7 +129,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, folde
   try {
     const settings = require("./settings.json");
     const erroredWorkflows = await checkWorkflows(
-      settings.folders, settings.folder_category_map
+      settings.folders, settings.allowed_categories
     )
 
     if (erroredWorkflows.length > 0) {
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index 7d3ecfe..667aff6 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -5,22 +5,22 @@
     "../../deployments",
     "../../code-scanning"
   ],
-  "folder_category_map": [
+  "allowed_categories": [
     {
-      "name":  "../../ci",
-      "category": "Continuous integration" 
+      "name":  "Continuous integration",
+      "path": "../../ci" 
     },
     {
-      "name": "../../automation",
-      "category": "Automation"
+      "name": "Automation",
+      "path": "../../automation"
     },
     { 
-      "name": "../../deployments",
-      "category": "Deployment"
+      "path": "../../deployments",
+      "name": "Deployment"
     },
     { 
-      "name": "../../code-scanning",
-      "category": "Code Scanning"
+      "name": "Code Scanning",
+      "path": "../../code-scanning"
     }
   ]
 }
\ No newline at end of file

From c032ee101f95b6b5be02ec2b43f8ad16f9af2e77 Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Mon, 2 May 2022 06:32:43 +0000
Subject: [PATCH 08/11] adding  dependency review to allowed categories

---
 script/validate-data/index.ts      | 8 ++++----
 script/validate-data/settings.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 5e6327a..7f7aa44 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -106,17 +106,17 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
       
     }
     var path = dirname(workflowPath)
-    var folder_category = allowed_categories.find( category => category["path"] == path)["name"]
+    var folder_categories = allowed_categories.find( category => category["path"] == path)["categories"]
     if (!workflowPath.endsWith("blank.yml")) {
       if(!properties.categories || properties.categories.length == 0) {
         workflowErrors.errors.push(`Workflow categories cannot be null or empty`)
       } 
-      else if(properties.categories[0].toLowerCase() !== folder_category.toLowerCase()) {
-        workflowErrors.errors.push(`The first category in properties.json categories must be "${folder_category}" for workflow in ${basename(path)} folder.`)
+      else if(!folder_categories.some(category => properties.categories[0].toLowerCase() == category.toLowerCase())) {
+        workflowErrors.errors.push(`The first category in properties.json categories for workflow in ${basename(path)} folder must be one of "${folder_categories}"`)
       }
     }
 
-    if(folder_category.toLowerCase() == 'deployment' && !properties.creator) {
+    if(path.toLowerCase() == 'deployment' && !properties.creator) {
       workflowErrors.errors.push(`The "creator" in properties.json must be present.`)
     }
   } catch (e) {
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index 2765c2a..852f575 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -20,7 +20,7 @@
     },
     { 
       "path": "../../code-scanning",
-      "categories": ["Code Scanning", "Dependency review"],
+      "categories": ["Code Scanning", "Dependency review"]
     }
   ]
 }

From 74122beced91569ee2a4181188911aae18aa909e Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Mon, 2 May 2022 13:22:36 +0000
Subject: [PATCH 09/11] Fixing creator check

---
 script/validate-data/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 7f7aa44..39328c5 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -116,7 +116,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
       }
     }
 
-    if(path.toLowerCase() == 'deployment' && !properties.creator) {
+    if(basename(path).toLowerCase() == 'deployments' && !properties.creator) {
       workflowErrors.errors.push(`The "creator" in properties.json must be present.`)
     }
   } catch (e) {

From f007e412eef70494c18a54191728f1138e84436b Mon Sep 17 00:00:00 2001
From: Daniel Schultz <slifty@gmail.com>
Date: Tue, 22 Mar 2022 21:17:20 -0400
Subject: [PATCH 10/11] Rename sync-ghes workflow for consistancy

Issue #1497
---
 .github/workflows/{sync_ghes.yaml => sync-ghes.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{sync_ghes.yaml => sync-ghes.yaml} (100%)

diff --git a/.github/workflows/sync_ghes.yaml b/.github/workflows/sync-ghes.yaml
similarity index 100%
rename from .github/workflows/sync_ghes.yaml
rename to .github/workflows/sync-ghes.yaml

From 52bd793f345de13bebd632f87f1d4544eb724768 Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Tue, 3 May 2022 11:00:55 +0530
Subject: [PATCH 11/11] Update script/validate-data/index.ts

Co-authored-by: Bishal Prasad <bishal-pdmsft@github.com>
---
 script/validate-data/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 39328c5..4bd260d 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -112,7 +112,7 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
         workflowErrors.errors.push(`Workflow categories cannot be null or empty`)
       } 
       else if(!folder_categories.some(category => properties.categories[0].toLowerCase() == category.toLowerCase())) {
-        workflowErrors.errors.push(`The first category in properties.json categories for workflow in ${basename(path)} folder must be one of "${folder_categories}"`)
+        workflowErrors.errors.push(`The first category in properties.json categories for workflow in ${basename(path)} folder must be one of "${folder_categories}. Either move the workflow to an appropriate directory or change the category."`)
       }
     }