@@ -15,67 +15,71 @@ if ($env:PublishChanges -eq $False)
1515 return ;
1616}
1717
18- Write-Host " `n git status:"
18+ Write-Host " `n 1. git status:"
1919git status | Write-Host
2020
21- Write-Host " `n Stash the update metadata files.....`n Running : git stash"
21+ Write-Host " `n 2. Stash the update metadata files.....`n 3. Running : git stash"
2222git stash | Write-Host
2323
24- Write-Host " `n Fetching latest master branch to ensure we are up to date..."
24+ Write-Host " `n 4. Fetching latest master branch to ensure we are up to date..."
2525git fetch origin master | Write-Host
2626# checkout master to move from detached HEAD mode
2727git switch master | Write-Host
2828
29- Write-Host " `n git status:"
29+
30+
31+ Write-Host " `n 5. git status:"
3032git status | Write-Host
3133
32- Write-Host " `n Apply stashed metadata files...`n Running : git stash pop"
34+ Write-Host " `n 6. Apply stashed metadata files...`n 7. Running : git stash pop"
3335git stash pop | Write-Host
3436
35- Write-Host " `n git status:"
37+ Write-Host " `n 8. git status:"
3638git status | Write-Host
3739
40+ $branch = " $env: EndpointVersion /$env: BUILD_BUILDID /updateOpenAPI"
41+
3842if ($env: CreateOpenAPIPR -eq $True )
3943{
40- Write-Host " `n Create branch: $env: BUILD_BUILDID /updateOpenAPI "
41- git checkout - B $env: BUILD_BUILDID / updateOpenAPI | Write-Host
44+ Write-Host " `n 9. Create branch: $branch "
45+ git checkout - B $branch | Write-Host
4246}
4347
44- Write-Host " `n Staging clean $env: EndpointVersion metadata files.....`n Running : git add ."
48+ Write-Host " `n 10. Staging clean $env: EndpointVersion metadata files.....`n 11. Running : git add ."
4549git add . | Write-Host
4650
47- Write-Host " `n git status:"
51+ Write-Host " `n 12. git status:"
4852git status | Write-Host
4953
50- Write-Host " `n Attempting to commit clean $env: EndpointVersion metadata files....."
54+ Write-Host " `n 13. Attempting to commit clean $env: EndpointVersion metadata files....."
5155
5256if ($env: BUILD_REASON -eq ' Manual' ) # Skip CI if manually running this pipeline.
5357{
54- git commit - m " Update clean metadata file with $env: BUILD_BUILDID [skip ci]" | Write-Host
58+ git commit - m " Update clean $ env: EndpointVersion metadata file with $env: BUILD_BUILDID [skip ci]" | Write-Host
5559}
5660else
5761{
58- git commit - m " Update clean metadata file with $env: BUILD_BUILDID " | Write-Host
62+ git commit - m " Update clean $ env: EndpointVersion metadata file with $env: BUILD_BUILDID " | Write-Host
5963}
6064
61- Write-Host " `n git status:"
65+ Write-Host " `n 14. git status:"
6266git status | Write-Host
6367
6468if ($env: CreateOpenAPIPR -eq $True )
6569{
66- Write-Host " `n Pushing branch for PR creation"
70+ Write-Host " `n 15a. Pushing branch for PR creation"
6771
68- Write-Host " `n git push --set-upstream origin $env: BUILD_BUILDID /updateOpenAPI: "
69- git push -- set-upstream origin $env: BUILD_BUILDID / updateOpenAPI | Write-Host
72+ Write-Host " `n 15b. Running: git push --set-upstream origin $branch "
73+ git push -- set-upstream origin $branch | Write-Host
7074}
7175else # original behavior: push to master
7276{
73- Write-Host " `n Running : git pull origin master --rebase..."
77+ Write-Host " `n 15c. Running : git pull origin master --rebase..."
7478 # sync branch before pushing
7579 # this is especially important while running v1 and beta in parallel
7680 # and one process goes out of sync because of the other's check-in
7781 git pull origin master -- rebase | Write-Host
7882
79- Write-Host " `n Running : git push --set-upstream origin master ..."
83+ Write-Host " `n 15d. Running : git push --set-upstream origin master ..."
8084 git push -- set-upstream origin master | Write-Host
8185}
0 commit comments