From 9eb822ccfbd09f846ec19caab2958516a810b9f6 Mon Sep 17 00:00:00 2001
From: MilenaHristova <mhristova@microsoft.com>
Date: Tue, 7 Feb 2023 14:35:05 +0100
Subject: [PATCH] scripts

---
 .../templates/jobs/vmr-synchronization.yml    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml
index 3213488a4..4ea21ac28 100644
--- a/eng/pipelines/templates/jobs/vmr-synchronization.yml
+++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml
@@ -55,21 +55,30 @@ jobs:
       vmrBranch: ${{ parameters.vmrBranch }}
       targetRef: ${{ parameters.targetRef }}
 
-  # For official builds, push the changes to the VMR
   # Push main and release branches to the public VMR
   - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
-    - script: |
-        set -x
-        ./.dotnet/dotnet darc vmr push --vmr "$(vmrPath)" --commit-verification-pat '$(BotAccount-dotnet-maestro-bot-no-scopes-PAT)' --branch '${{ parameters.vmrBranch }}' --remote-url '$(vmrPublicUrl)' --github-pat '$(BotAccount-dotnet-bot-repo-PAT)' --verbose
+    - script: >
+        ./.dotnet/dotnet darc vmr push
+        --vmr '$(vmrPath)'
+        --commit-verification-pat '$(BotAccount-dotnet-maestro-bot-no-scopes-PAT)'
+        --branch '${{ parameters.vmrBranch }}'
+        --remote-url '$(vmrPublicUrl)'
+        --github-pat '$(BotAccount-dotnet-bot-repo-PAT)'
+        --verbose
       displayName: Push changes to dotnet/dotnet (public)
       workingDirectory: $(vmrPath)/src/installer
       condition: and(succeeded(), or(eq(variables['vmrBranch'], 'main'), startsWith(variables['vmrBranch'], 'release/')))
   
   # Push internal/release branches to the internal VMR
   - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
-    - script: |
-        set -x
-        ./.dotnet/dotnet darc vmr push --vmr "$(vmrPath)" --skip-commit-verification --branch '${{ parameters.vmrBranch }}' --remote-url '$(vmrPrivateUrl)' --azdev-pat '$(dn-bot-dnceng-build-rw-code-rw)' --verbose
+    - script: >
+        ./.dotnet/dotnet darc vmr push
+        --vmr '$(vmrPath)'
+        --skip-commit-verification
+        --branch '${{ parameters.vmrBranch }}'
+        --remote-url '$(vmrPrivateUrl)'
+        --azdev-pat '$(dn-bot-dnceng-build-rw-code-rw)'
+        --verbose
       displayName: Push changes to dotnet-dotnet (internal)
       workingDirectory: $(vmrPath)/src/installer
       condition: and(succeeded(), startsWith(variables['vmrBranch'], 'internal/release/'))
\ No newline at end of file