File tree Expand file tree Collapse file tree 2 files changed +10
-9
lines changed
Expand file tree Collapse file tree 2 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -517,7 +517,12 @@ stages:
517517 branchName : ' kiota/$(betaBranch)'
518518 targetClassName : " BaseGraphClient"
519519 targetNamespace : ' Microsoft\\Graph\\Beta\\Generated'
520+ <<<<<<< Updated upstream
520521 baseBranchName : ' dev'
522+ =======
523+ baseBranchName : ' main'
524+ commitMessagePrefix : " feat(generation): update request builders and models"
525+ >>>>>>> Stashed changes
521526 cleanMetadataFolder : $(cleanOpenAPIFolderBeta)
522527 languageSpecificSteps :
523528 - template : generation-templates/php-kiota.yml
@@ -546,7 +551,12 @@ stages:
546551 branchName : ' kiota/$(v1Branch)'
547552 targetClassName : " BaseGraphClient"
548553 targetNamespace : ' Microsoft\\Graph\\Generated'
554+ <<<<<<< Updated upstream
549555 baseBranchName : ' dev'
556+ =======
557+ baseBranchName : ' main'
558+ commitMessagePrefix : " feat(generation): update request builders and models"
559+ >>>>>>> Stashed changes
550560 cleanMetadataFolder : $(cleanOpenAPIFolderV1)
551561 languageSpecificSteps :
552562 - template : generation-templates/php-kiota.yml
Original file line number Diff line number Diff line change 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 }}/
You can’t perform that action at this time.
0 commit comments