Travis -- fix build on OSX, simplify travis and get rid of yarn

2018-08-31 18:11:45 +03:00
parent 3af62e463a
commit c4fefa10b0
5 changed files with 16602 additions and 9639 deletions
--- a/4
+++ b/4
@@ -12,8 +12,8 @@ all: build
 build: AdguardDNS coredns

 $(STATIC):
-	yarn --cwd client install
-	yarn --cwd client run build-prod
+	cd client; npm install
+	cd client; npm run build-prod

 AdguardDNS: $(STATIC) *.go
 	echo mkfile_dir = $(mkfile_dir)