From 08758159cc1cd39d544e33d746631c582e070cf5 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <kubuxu@protocol.ai>
Date: Fri, 4 Oct 2019 22:10:49 +0200
Subject: [PATCH] Use ./lotus fetch-params for CI

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
---
 .circleci/config.yml |  8 +++-----
 Makefile             | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e5ae01433..fcdf73642 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,7 @@ commands:
             - 'v2-lotus-params-'
           paths:
             - /var/tmp/filecoin-proof-parameters/
-      - run:  make build/.params-1024
+      - run:  ./lotus fetch-params
       - save_cache:
           name: Save parameters cache
           key: 'v2-lotus-params-{{ checksum "build/proof-params/parameters.json" }}'
@@ -81,11 +81,10 @@ jobs:
       - install-deps
       - prepare
       - go/mod-download
-      - run: echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV
-      - download-params
       - run:
-          command: make deps
+          command: make deps lotus
           no_output_timeout: 30m
+      - download-params
       - go/install-gotestsum:
           gobin: $HOME/.local/bin
       - run:
@@ -137,7 +136,6 @@ jobs:
       - install-deps
       - prepare
       - go/mod-download
-      - download-params
       - run:
           command: make deps
           no_output_timeout: 30m
diff --git a/Makefile b/Makefile
index 07256e2a7..46ba14ad1 100644
--- a/Makefile
+++ b/Makefile
@@ -55,15 +55,27 @@ CLEAN+=build/.update-modules
 deps: $(BUILD_DEPS)
 .PHONY: deps
 
-build: $(BUILD_DEPS)
-	rm -f lotus lotus-storage-miner
+lotus: $(BUILD_DEPS)
+	rm -f lotus
 	go build -o lotus ./cmd/lotus
-	go build -o lotus-storage-miner ./cmd/lotus-storage-miner
 	go run github.com/GeertJohan/go.rice/rice append --exec lotus -i ./build
+
+.PHONY: lotus
+CLEAN+=lotus
+
+lotus-sotrage-miner: $(BUILD_DEPS)
+	rm -f lotus-storage-miner
+	go build -o lotus-storage-miner ./cmd/lotus-storage-miner
 	go run github.com/GeertJohan/go.rice/rice append --exec lotus-storage-miner -i ./build
+
+.PHONY: lotus-storage-miner
+
+CLEAN+=lotus-storage-miner
+
+build: lotus lotus-sotrage-miner
+
 .PHONY: build
 
-CLEAN+= lotus lotus-storage-miner
 
 benchmarks:
 	go run github.com/whyrusleeping/bencher ./... > bench.json