From 697b2dde7383c43d9cf828accafad815e51a04df Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Sat, 6 May 2017 22:59:24 -0700 Subject: [PATCH] Revert "Revert "Fix mac ci build"" --- cli-mac/build-bits.sh | 6 ++++++ docker-compose.ci.build.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 cli-mac/build-bits.sh diff --git a/cli-mac/build-bits.sh b/cli-mac/build-bits.sh old mode 100644 new mode 100755 index f8ad2e2f9..681c3605d --- a/cli-mac/build-bits.sh +++ b/cli-mac/build-bits.sh @@ -10,6 +10,12 @@ projectList=( "../src/Web/WebStatus" ) + +pushd $(pwd)/../src/Web/WebSPA +npm install +npm rebuild node-sass +popd + for project in "${projectList[@]}" do echo -e "\e[33mWorking on $(pwd)/$project" diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml index 546b7690f..26122e3f8 100644 --- a/docker-compose.ci.build.yml +++ b/docker-compose.ci.build.yml @@ -6,5 +6,5 @@ services: volumes: - .:/src working_dir: /src - command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish" + command: /bin/bash -c "pushd ./src/Web/WebSPA && npm install && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"