diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-06 20:11:26 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-06 20:11:26 -0800 |
| commit | 6e9eafb7ed6a841e3c8eff8e3a674037a9f30f26 (patch) | |
| tree | ea13bc78c6a244729a68202bad5b1a398965b7ca /scripts | |
| parent | 7c19e0ad86680827592a832cc3b31fd7a96ce42e (diff) | |
| download | vcpkg-6e9eafb7ed6a841e3c8eff8e3a674037a9f30f26.tar.gz vcpkg-6e9eafb7ed6a841e3c8eff8e3a674037a9f30f26.zip | |
Do a git-reset after using git --worktree checkout
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/doVcpkgRelease.ps1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/doVcpkgRelease.ps1 b/scripts/doVcpkgRelease.ps1 index 97656ba69..fb964d0c3 100644 --- a/scripts/doVcpkgRelease.ps1 +++ b/scripts/doVcpkgRelease.ps1 @@ -54,6 +54,7 @@ for ($disableMetrics = 0; $disableMetrics -le 1; $disableMetrics++) $checkoutForBuildOnly = ".\scripts",".\toolsrc",".vcpkg-root" # Must be relative to the root of the repository Write-Verbose("Creating partial temporary checkout: $buildPath") git --git-dir="$dotGitDir" --work-tree="$workTreeForBuildOnly" checkout $gitHash -f -q -- $checkoutForBuildOnly + git reset & "$buildPath\scripts\bootstrap.ps1" -disableMetrics $disableMetrics @@ -62,6 +63,7 @@ for ($disableMetrics = 0; $disableMetrics -le 1; $disableMetrics++) $checkoutThisDir = ".\" # Must be relative to the root of the repository Write-Verbose("Creating temporary checkout: $releasePath") git --git-dir=$dotGitDir --work-tree=$workTree checkout $gitHash -f -q -- $checkoutThisDir + git reset Copy-Item $buildPath\vcpkg.exe $releasePath\vcpkg.exe | Out-Null Copy-Item $buildPath\scripts\vcpkgmetricsuploader.exe $releasePath\scripts\vcpkgmetricsuploader.exe | Out-Null |