Workflow Bug fixes (#11699)

Updated ts workflow files to fix bugs
Azure · Jan 23, 2025 · 9954448 · 9954448
1 parent bb104b3
commit 9954448
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.script/idChangeValidator.ts b/.script/idChangeValidator.ts
@@ -27,7 +27,7 @@ export async function IsIdHasChanged(filePath: string): Promise<ExitCode> {
             return ExitCode.ERROR;
         }
 
-        const options = [pr.targetBranch, pr.sourceBranch, filePath];
+        const options = [pr.base.ref, pr.head.ref, filePath];
         const diffSummary = await git.diff(options);
         const idPosition = diffSummary.search(templateIdRegex);
         const idHasChanged = idPosition > 0;

diff --git a/.script/utils/gitHubWrapper.ts b/.script/utils/gitHubWrapper.ts
@@ -72,7 +72,7 @@ export async function GetDiffFiles(fileKinds: string[], fileTypeSuffixes?: strin
   console.log(`${changedFiles.length} files changed in current PR`);
 
   const filterChangedFiles = changedFiles
-    .filter(change => fileKinds.includes(change.status))
+    .filter(change => fileKinds.map(kind => kind.toLowerCase()).includes(change.status.toLowerCase()))
     .map(change => change.filename)
     .filter(filePath => typeof fileTypeSuffixes === "undefined" || filePath.endsWithAny(fileTypeSuffixes))
     .filter(filePath => typeof filePathFolderPreffixes === "undefined" || filePath.startsWithAny(filePathFolderPreffixes))

diff --git a/.script/utils/workbookCheckers/isVersionIncrementedOnModification.ts b/.script/utils/workbookCheckers/isVersionIncrementedOnModification.ts
@@ -20,7 +20,7 @@ export async function isVersionIncrementedOnModification(items: Array<WorkbookMe
   if(pr){ // pr may return undefined
       const changedFiles = await GetDiffFiles(fileKinds, fileTypeSuffixes, filePathFolderPrefixes);
     if(changedFiles && changedFiles.length > 0){
-      const options = [pr.targetBranch, pr.sourceBranch, gitDiffFileFullContentOption, `${workbooksDirectoryPath}/WorkbooksMetadata.json`];
+      const options = [pr.base.ref, pr.head.ref, gitDiffFileFullContentOption, `${workbooksDirectoryPath}/WorkbooksMetadata.json`];
         const diffSummary = await git.diff(options);
         const diffLinesArray: string[] = diffSummary.split('\n').map((l: string) => l.trim());
         const versionChanges = extractVersionChangesByWorkbook(diffLinesArray);