From 379d1b60bde1327d5351c65b9349c0da890dee0f Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sun, 4 Aug 2019 20:24:46 -0400 Subject: [PATCH] fix npm install from build scripts --- src/Admin/build.ps1 | 5 ++++- src/Admin/build.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Admin/build.ps1 b/src/Admin/build.ps1 index 0a2a99fd0d..9d4917e076 100644 --- a/src/Admin/build.ps1 +++ b/src/Admin/build.ps1 @@ -1,3 +1,4 @@ +$curDir = pwd $dir = Split-Path -Parent $MyInvocation.MyCommand.Path echo "`n## Building Admin" @@ -9,7 +10,9 @@ dotnet restore $dir\Admin.csproj echo "Clean" dotnet clean $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish echo "Node Build" -npm --prefix $dir install $dir +cd $dir +npm install +cd $curDir gulp --gulpfile $dir\gulpfile.js build echo "Publish" dotnet publish $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish diff --git a/src/Admin/build.sh b/src/Admin/build.sh index f3e0ca43c5..5c82493368 100755 --- a/src/Admin/build.sh +++ b/src/Admin/build.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e +CUR_DIR="$(pwd)" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo -e "\n## Building Admin" @@ -12,7 +13,9 @@ dotnet restore $DIR/Admin.csproj echo "Clean" dotnet clean $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish echo "Node Build" -npm --prefix $DIR install $DIR +cd $DIR +npm install +cd $CUR_DIR gulp --gulpfile $DIR/gulpfile.js build echo "Publish" dotnet publish $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish