File tree Expand file tree Collapse file tree 3 files changed +12
-9
lines changed Expand file tree Collapse file tree 3 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ trigger:
2626 branches :
2727 include :
2828 - main
29- - features/2.0
29+ - dev
3030pr : none
3131
3232jobs :
@@ -69,11 +69,11 @@ jobs:
6969 publishLocation : " Container"
7070
7171 - task : NuGetCommand@2
72- displayName : Publish NuGet to preview feed
72+ displayName : Publish NuGet to feed
7373 inputs :
7474 command : push
7575 packagesToPush : $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.*.nupkg
76- publishVstsFeed : $(PROJECT_NAME)/$(PREVIEW_FEED_NAME )
76+ publishVstsFeed : $(PROJECT_NAME)/$(FEED_NAME )
7777 allowPackageConflicts : true
7878
7979 - template : ./common-templates/security-post-checks.yml
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ schedules:
88 displayName : ' PowerShellExamplesUpdateV2'
99 branches :
1010 include :
11- - features/2.0
11+ - dev
1212 always : true
1313parameters :
1414- name : PipelineTimeout
@@ -25,7 +25,7 @@ resources:
2525 type : github
2626 endpoint : microsoftgraph
2727 name : microsoftgraph/msgraph-sdk-powershell
28- ref : features/2.0
28+ ref : dev
2929
3030jobs :
3131- job : PowerShellExamplesUpdateV2
8888
8989 - template : ./common-templates/create-pr.yml
9090 parameters :
91- BaseBranch : " features/2.0 "
91+ BaseBranch : " dev "
9292 TargetBranch : $(ComputeBranch.WeeklyExamplesBranch)
9393 Title : " [v2] Examples Update"
9494 Body : " This pull request was automatically created by Azure Pipelines. **Important** Check for unexpected deletions or changes in this PR."
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ parameters:
99 default : 1es-windows-ps-compute
1010 - name : BaseBranch
1111 displayName : Base Branch
12- default : features/2.0
12+ default : dev
1313 - name : GenerationBranch
1414 displayName : Generation branch
1515 default : v2/generation
@@ -35,7 +35,7 @@ parameters:
3535 type : boolean
3636
3737variables :
38- Branch : " WeeklyRefresh "
38+ Branch : " WeeklyApiRefresh "
3939 BaseBranch : ${{ parameters.BaseBranch }}
4040 GenerationBranch : ${{ parameters.GenerationBranch }}
4141 BuildAgent : ${{ parameters.BuildAgent }}
@@ -49,7 +49,7 @@ schedules:
4949 displayName : " PS SDK Weekly Refresh"
5050 branches :
5151 include :
52- - features/2.0
52+ - dev
5353 always : true
5454jobs :
5555 - job : RefreshOpenAPIDocuments
7373 variables :
7474 WeeklyBranch : $[ dependencies.RefreshOpenAPIDocuments.outputs['ComputeBranch.WeeklyBranch'] ]
7575 steps :
76+ - template : ./common-templates/checkout.yml
77+ parameters :
78+ TargetBranch : $(GenerationBranch) # Gives git local knowledge of the branch for merge.
7679 - template : ./common-templates/checkout.yml
7780 parameters :
7881 TargetBranch : $(WeeklyBranch)
You can’t perform that action at this time.
0 commit comments