Skip to content

Commit c4cb761

Browse files
committed
Fix paths
1 parent 5cd2d11 commit c4cb761

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ steps:
128128
129129
echo "Updating the VMR from $repository / $commit..."
130130
cd ..
131-
git clone $repository $commit
132-
cd $commit
131+
git clone $repository ${{ assetName }}
132+
cd ${{ assetName }}
133133
git checkout $commit
134134
git branch "sync/$commit"
135135
136-
./eng/vmr-sync.sh \
136+
$(Agent.BuildDirectory)/sdk/eng/vmr-sync.sh \
137137
--vmr ${{ parameters.vmrPath }} \
138138
--tmp $(Agent.TempDirectory) \
139139
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
@@ -171,12 +171,12 @@ steps:
171171
172172
Write-Host "Updating the VMR from $repository / $commit..."
173173
cd ..
174-
git clone $repository $commit
175-
cd $commit
174+
git clone $repository ${{ assetName }}
175+
cd ${{ assetName }}
176176
git checkout $commit
177177
git branch "sync/$commit"
178178
179-
$(Agent.BuildDirectory)/sdk/eng/vmr-sync.ps1 `
179+
$(Agent.BuildDirectory)\sdk\eng\vmr-sync.ps1 `
180180
-vmr ${{ parameters.vmrPath }} `
181181
-tmp $(Agent.TempDirectory) `
182182
-azdevPat '$(dn-bot-all-orgs-code-r)' `

eng/vmr-sync.ps1

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ param (
4444
[switch]$debugOutput
4545
)
4646

47-
$scriptRoot = $PSScriptRoot
48-
4947
function Fail {
5048
Write-Host "> $($args[0])" -ForegroundColor 'Red'
5149
}
@@ -103,7 +101,7 @@ Set-StrictMode -Version Latest
103101
# Prepare darc
104102

105103
Highlight 'Installing .NET, preparing the tooling..'
106-
. $scriptRoot\common\tools.ps1
104+
. .\eng\common\tools.ps1
107105
$dotnetRoot = InitializeDotNetCli -install:$true
108106
$dotnet = "$dotnetRoot\dotnet.exe"
109107
& "$dotnet" tool restore

eng/vmr-sync.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ set -e
162162
# Prepare darc
163163

164164
highlight 'Installing .NET, preparing the tooling..'
165-
source "$scriptroot/common/tools.sh"
165+
source "./eng/common/tools.sh"
166166
InitializeDotNetCli true
167-
dotnetDir=$( cd $scriptroot/../.dotnet/; pwd -P )
167+
dotnetDir=$( cd ./.dotnet/; pwd -P )
168168
dotnet=$dotnetDir/dotnet
169169
"$dotnet" tool restore
170170

0 commit comments

Comments
 (0)