Skip to content

Commit eee6fef

Browse files
committed
ci: update for supporting builds
1 parent efe36c0 commit eee6fef

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

.azure-pipelines/generation-templates/capture-openapi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ jobs:
155155
overwrite: true
156156
displayName: Copy OpenAPI files to local msgraph-metadata repo
157157

158-
# Push changes to msgraph-metadata repo and create PR
158+
# Push changes to msgraph-metadata repo
159159
- pwsh: '$(scriptsDirectory)/git-push-cleanmetadata.ps1'
160-
displayName: PR for ${{ parameters.endpoint }} OpenAPI description in msgraph-metadata repo
160+
displayName: Publish ${{ parameters.endpoint }} OpenAPI description to msgraph-metadata repo
161161
env:
162162
CreateOpenAPIPR: True
163163
EndpointVersion: ${{ parameters.endpoint }}

scripts/create-pull-request.ps1

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,15 @@ if (($env:GeneratePullRequest -eq $False)) { # Skip CI if manually running this
99
return;
1010
}
1111

12-
$version = $env:Version
13-
14-
if ($version -ne '')
12+
# Special case for beta typings as it uses a non-conforming preview versioning. Helps with triggering Release Please.
13+
if ($env:RepoName.Contains("msgraph-beta-typescript-typings"))
1514
{
16-
# Special case for beta typings as it uses a non-conforming preview versioning. Helps with triggering Release Please.
17-
if ($env:RepoName.Contains("msgraph-beta-typescript-typings"))
18-
{
19-
$title = "feat: generated $version models and request builders"
20-
}
21-
else {
22-
$title = "Generated $version models and request builders"
23-
}
15+
$title = "feat: generated $env:Version models and request builders"
16+
}
17+
else {
18+
$title = "Generated $env:Version models and request builders"
2419
}
20+
2521
$body = ":bangbang:**_Important_**:bangbang: <br> Check for unexpected deletions or changes in this PR and ensure relevant CI checks are passing. <br><br> **Note:** This pull request was automatically created by Azure pipelines."
2622
$baseBranchParameter = ""
2723

scripts/git-push-cleanmetadata.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ git stash pop | Write-Host
3737
Write-Host "`n8. git status:"
3838
git status | Write-Host
3939

40-
$branch = "$env:EndpointVersion/$env:BUILD_BUILDID/updateOpenAPI"
40+
$branch = "publish-open-api-files/$env:BUILD_BUILDID/$env:EndpointVersion"
4141

4242
if ($env:CreateOpenAPIPR -eq $True)
4343
{

0 commit comments

Comments
 (0)