Skip to content

Commit 12bdc33

Browse files
committed
Remove extra arg
1 parent 452ac66 commit 12bdc33

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

eng/pipelines/templates/steps/vmr-pull-updates.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ steps:
4343
workingDirectory: ${{ parameters.vmrPath }}
4444

4545
- script: |
46-
./eng/vmr-sync.sh \
47-
--vmr ${{ parameters.vmrPath }} \
48-
--tmp $(Agent.TempDirectory) \
49-
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
50-
--branch ${{ parameters.vmrBranch }} \
51-
--ci \
46+
./eng/vmr-sync.sh \
47+
--vmr ${{ parameters.vmrPath }} \
48+
--tmp $(Agent.TempDirectory) \
49+
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
50+
--branch ${{ parameters.vmrBranch }} \
51+
--ci \
5252
--debug
5353
5454
if [ "$?" -ne 0 ]; then

eng/vmr-sync.ps1

+1-20
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ Required. Path to the temporary folder where repositories will be cloned
2121
.PARAMETER vmrBranch
2222
Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch
2323
24-
.PARAMETER remote
25-
Optional. Additional remote to use during the synchronization
26-
This can be used to synchronize to a commit from a fork of the repository
27-
Example: 'runtime:https://github.com/yourfork/runtime'
28-
2924
.PARAMETER azdevPat
3025
Optional. Azure DevOps PAT to use for cloning private repositories.
3126
@@ -59,23 +54,13 @@ function Highlight {
5954
Write-Host "> $($args[0])" -ForegroundColor 'Cyan'
6055
}
6156

62-
$sdkDir = (Split-Path -Parent $scriptRoot)
63-
64-
# If sdk is a repo, we're in an sdk and not in the dotnet/dotnet repo
65-
if (Test-Path -Path "$sdkDir/.git" -PathType Container) {
66-
$additionalRemotes = "sdk:$sdkDir"
67-
}
68-
69-
if ($remote) {
70-
$additionalRemotes = "$additionalRemotes $remote"
71-
}
72-
7357
$verbosity = 'verbose'
7458
if ($debugOutput) {
7559
$verbosity = 'debug'
7660
}
7761
# Validation
7862

63+
$sdkDir = (Split-Path -Parent $scriptRoot)
7964
if (-not (Test-Path -Path $sdkDir -PathType Container)) {
8065
Fail "Directory '$sdkDir' does not exist. Please specify the path to the dotnet/sdk repo"
8166
exit 1
@@ -143,10 +128,6 @@ if ($ci) {
143128
$darcArgs += ("--ci")
144129
}
145130

146-
if ($additionalRemotes) {
147-
$darcArgs += ("--additional-remotes", $additionalRemotes)
148-
}
149-
150131
if ($azdevPat) {
151132
$darcArgs += ("--azdev-pat", $azdevPat)
152133
}

0 commit comments

Comments
 (0)