Skip to content

Commit 4ba2a4c

Browse files
authored
Merge pull request #25377 from microsoftgraph/update-perms-ref-gen-yaml
Fix new line appended to permissions reference file with each run
2 parents bc09028 + 3dd4c08 commit 4ba2a4c

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.github/workflows/permissions-reference-gen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
git add .
7878
git commit -m "Correct errors in permissions reference"
7979
git checkout -b $branchName
80-
git push --set-upstream origin $branchName
80+
git push --set-upstream origin $branchName -f
8181
8282
gh pr create --base main --title $prTitle --body "Scheduled permissions reference update" --reviewer "FaithOmbongi,msewaweru" --label "ready for content review"
8383
}

update-permissions-reference.ps1

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,21 @@ function Update-FileContent {
135135
$beforeFirstHeader = $fileContents[0..($firstHeaderIndex - 1)]
136136
$afterSecondHeader = $fileContents[$secondHeaderIndex..($fileContents.Count - 1)]
137137

138-
# Update ms.date
139-
$today = Get-Date -Format "MM/dd/yyyy"
140-
$beforeFirstHeader = $beforeFirstHeader -replace '^ms\.date:.*', "ms.date: $today"
138+
# Trim any trailing empty lines
139+
for ($i = $afterSecondHeader.Length - 1; $i -ge 0; $i--) {
140+
if ($afterSecondHeader[$i] -ne "") {
141+
break
142+
}
143+
$afterSecondHeader = $afterSecondHeader[0..($i - 1)]
144+
}
145+
146+
# Update ms.date
147+
$today = Get-Date -Format "MM/dd/yyyy"
148+
$beforeFirstHeader = $beforeFirstHeader -replace '^ms\.date:.*', "ms.date: $today"
141149

142150
# Combine the parts with the new content
143-
$updatedContent = $beforeFirstHeader + $NewContent.Split("`n") + $afterSecondHeader
144-
151+
$updatedContent = $beforeFirstHeader + $NewContent + $afterSecondHeader
152+
145153
# Write the updated content back to the file
146154
$updatedContent | Set-Content -Path $FilePath
147155
}

0 commit comments

Comments
 (0)