From 85b8f033da778ecf7d2958f9173b7b48ae1028f2 Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Mon, 17 Oct 2016 21:58:31 +0100 Subject: [PATCH] Temporarily use modified build system to see if it fixes CI issues. Also remove earlier attempted workaround. --- build.ps1 | 5 +---- build.sh | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build.ps1 b/build.ps1 index fe1454dbac..a7485eec61 100644 --- a/build.ps1 +++ b/build.ps1 @@ -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 $repoFolder = $PSScriptRoot $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) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index 3d8bbf51ec..661f9180f3 100755 --- a/build.sh +++ b/build.sh @@ -2,10 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -# Avoid issues similar to https://github.com/npm/npm/issues/10826 -npm cache clean - -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +koreBuildZip="https://codeload.github.com/aspnet/KoreBuild/zip/stevesa/npm-in-series" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi