diff --git a/scripts/windows/ci/install.ps1 b/scripts/windows/ci/install.ps1 index ced6023ad55..ecb7c9194cc 100644 --- a/scripts/windows/ci/install.ps1 +++ b/scripts/windows/ci/install.ps1 @@ -1,4 +1,4 @@ -# Appveyor already sets $PLATFORM to exactly what we don't want, so +# Appveyor already sets $PLATFORM to exactly what we don't want, so # we'll prepend it with 'windows_' if that seems to be the case. If ($env:PLATFORM -Match '^x86|x64$') { $env:PLATFORM = "windows_${env:PLATFORM}" @@ -7,6 +7,10 @@ If ($env:PLATFORM -Match '^x86|x64$') { $dirCheckout = (Get-Item $PSScriptRoot).parent.parent.parent.FullName $meteorBat = Join-Path $dirCheckout 'meteor.bat' +Write-Host "Resetting git checkout..." -ForegroundColor Magenta +& git.exe -C "$dirCheckout" reset --hard +& git.exe -C "$dirCheckout" submodule foreach --recursive 'git reset --hard' + Write-Host "Updating submodules recursively..." -ForegroundColor Magenta # Appveyor suggests -q flag for 'git submodule...' https://goo.gl/4TFAHm & git.exe -C "$dirCheckout" submodule -q update --init --recursive @@ -32,7 +36,6 @@ while ($attempt -gt 0 -and -not $success) { } else { $attempt-- } - } If ($LASTEXITCODE -ne 0) { diff --git a/scripts/windows/ci/test.ps1 b/scripts/windows/ci/test.ps1 index 7c94f9ea2b5..fb813d33fa3 100644 --- a/scripts/windows/ci/test.ps1 +++ b/scripts/windows/ci/test.ps1 @@ -1,4 +1,4 @@ -# For now, we only have one script. +# For now, we only have one script. $jUnit = Join-Path $env:TEMP 'self-test-junit-0.xml' $tests = @( @@ -27,4 +27,4 @@ If ($selfTestExitCode -eq 0) { If ($selfTestExitCode -ne 0) { Exit $selfTestExitCode -} +} \ No newline at end of file