Skip to content

Commit 2c92340

Browse files
authored
Merge pull request #1215 from microsoftgraph/dev
main refresh
2 parents a5bb1d6 + e8a1e16 commit 2c92340

File tree

6 files changed

+19
-2
lines changed

6 files changed

+19
-2
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ stages:
458458
targetNamespace: "com.Microsoft.Graph"
459459
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
460460
customArguments: "-b -e '/me' -e '/me/**'" # Exclude /me/** and enable backing store
461+
commitMessagePrefix: "feat(generation): update request builders and models"
461462
languageSpecificSteps:
462463
- template: generation-templates/java-kiota.yml
463464
parameters:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ steps:
119119
- pwsh: $(Build.SourcesDirectory)/msgraph-metadata/scripts/run-metadata-validation.ps1 -repoDirectory "$(Build.SourcesDirectory)/msgraph-metadata/" -version "${{ parameters.endpoint }}"
120120
displayName: 'verify whether metadata is parsable as an Edm model'
121121

122+
# clean up extra files
123+
- pwsh: rm $(Build.SourcesDirectory)/msgraph-metadata/transformed_*_metadata.* -Verbose -Force
124+
displayName: 'clean up transformed metadata generated by validation'
125+
122126
# Checkin clean metadata into metadata repo or make it an artifact.
123127
- pwsh: '$(scriptsDirectory)/git-push-cleanmetadata.ps1'
124128

.azure-pipelines/generation-templates/php-kiota.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,12 @@ steps:
99
BuildConfiguration: $(buildConfiguration)
1010
OutputFullPath: $(kiotaDirectory)/output/*
1111
RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/Generated/
12+
13+
# right now the script runs fine with PHP 8.1 which is what is installed by default on the agent
14+
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
15+
# but we should use a setup task to install the right version of PHP
16+
# however, there does not seem to exist a setup-php task (equivalent to UseDotnet)
17+
18+
- pwsh: 'php $(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts/BumpStableSdkVersion.php'
19+
displayName: Bump minor version for ${{ parameters.repoName }}
20+
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/

.azure-pipelines/generation-templates/python.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ steps:
1818
OutputFullPath: $(kiotaDirectory)/output/*
1919
RepoModelsDir: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/${{ parameters.baseDirectory }}/generated'
2020

21+
- pwsh: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts/incrementMinorVersion.ps1'
22+
displayName: Bump minor version for ${{ parameters.repoName }}
23+
workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/

0 commit comments

Comments
 (0)