From e52662811933be45f51a6e68e833a3f1a627d762 Mon Sep 17 00:00:00 2001 From: Sampark Sharma Date: Wed, 23 Feb 2022 10:33:02 +0000 Subject: [PATCH] Fix to resolve code scanning inclusions to ghes --- script/sync-ghes/index.ts | 11 ++++++++--- script/sync-ghes/settings.json | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/script/sync-ghes/index.ts b/script/sync-ghes/index.ts index 608e73d..90b8b5a 100755 --- a/script/sync-ghes/index.ts +++ b/script/sync-ghes/index.ts @@ -33,13 +33,15 @@ interface WorkflowsCheckResult { async function checkWorkflows( folders: string[], enabledActions: string[], - partners: string[] + partners: string[], + codeScanningTemplates: string[] ): Promise { const result: WorkflowsCheckResult = { compatibleWorkflows: [], incompatibleWorkflows: [], }; const partnersSet = new Set(partners.map((x) => x.toLowerCase())); + const codeScanningTemplatesSet = new Set(codeScanningTemplates) for (const folder of folders) { const dir = await fs.readdir(folder, { @@ -59,9 +61,11 @@ async function checkWorkflows( const isPartnerWorkflow = workflowProperties.creator ? partnersSet.has(workflowProperties.creator.toLowerCase()) : false; + const isCodeScanningTemplateEnabled = (folder === "../../code-scanning") ? codeScanningTemplatesSet.has(e.name) : true; + const enabled = !isPartnerWorkflow && - workflowProperties.enterprise !== false && + isCodeScanningTemplateEnabled && (await checkWorkflow(workflowFilePath, enabledActions)); const workflowDesc: WorkflowDesc = { @@ -133,7 +137,8 @@ async function checkWorkflow( const result = await checkWorkflows( settings.folders, settings.enabledActions, - settings.partners + settings.partners, + settings.codeScanningTemplates ); console.group( diff --git a/script/sync-ghes/settings.json b/script/sync-ghes/settings.json index 9648ab4..e14f43f 100644 --- a/script/sync-ghes/settings.json +++ b/script/sync-ghes/settings.json @@ -28,5 +28,8 @@ "Red Hat", "Tencent Cloud", "HashiCorp" + ], + "codeScanningTemplates": [ + "codeql.yml" ] }