Temporarily use modified build system to see if it fixes CI issues. Also remove earlier attempted workaround.

This commit is contained in:
SteveSandersonMS
2016-10-17 21:58:31 +01:00
parent 6f44227917
commit 85b8f033da
2 changed files with 2 additions and 8 deletions

View File

@@ -28,15 +28,12 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
} }
} }
# Avoid issues similar to https://github.com/npm/npm/issues/10826
npm cache clean
cd $PSScriptRoot cd $PSScriptRoot
$repoFolder = $PSScriptRoot $repoFolder = $PSScriptRoot
$env:REPO_FOLDER = $repoFolder $env:REPO_FOLDER = $repoFolder
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" $koreBuildZip="https://codeload.github.com/aspnet/KoreBuild/zip/stevesa/npm-in-series"
if ($env:KOREBUILD_ZIP) if ($env:KOREBUILD_ZIP)
{ {
$koreBuildZip=$env:KOREBUILD_ZIP $koreBuildZip=$env:KOREBUILD_ZIP

View File

@@ -2,10 +2,7 @@
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $repoFolder cd $repoFolder
# Avoid issues similar to https://github.com/npm/npm/issues/10826 koreBuildZip="https://codeload.github.com/aspnet/KoreBuild/zip/stevesa/npm-in-series"
npm cache clean
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
if [ ! -z $KOREBUILD_ZIP ]; then if [ ! -z $KOREBUILD_ZIP ]; then
koreBuildZip=$KOREBUILD_ZIP koreBuildZip=$KOREBUILD_ZIP
fi fi