Merge pull request #279 from filecoin-project/build/rm-paramfetch

build: remove paramfetch from make
This commit is contained in:
Jakub Sztandera 2019-10-04 22:18:17 +02:00 committed by GitHub
commit 1ea23da756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 25 deletions

View File

@ -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

View File

@ -50,36 +50,32 @@ build/.update-modules:
## PROOFS
bin/ipget:
./bin/dist_get /ipns/dist.ipfs.io ipget bin/ipget v0.5.0
PARAM_SECTOR_SIZES:=1024 16777216 268435456 1073741824
PARAM_SECTOR_SIZES:=$(addprefix build/.params-,$(PARAM_SECTOR_SIZES))
./build/paramfetch.sh: build/proof-params/parameters.json
build/proof-params/mkparamfetch.sh
$(PARAM_SECTOR_SIZES): ./build/paramfetch.sh build/proof-params/parameters.json bin/ipget
./build/paramfetch.sh
touch $@
BUILD_DEPS+=build/.params-1024
CLEAN+=build/.params-1024
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

View File

@ -115,6 +115,7 @@ var Commands = []*cli.Command{
chainCmd,
clientCmd,
createMinerCmd,
fetchParamCmd,
mpoolCmd,
netCmd,
paychCmd,

19
cli/params.go Normal file
View File

@ -0,0 +1,19 @@
package cli
import (
"github.com/filecoin-project/go-lotus/build"
"golang.org/x/xerrors"
"gopkg.in/urfave/cli.v2"
)
var fetchParamCmd = &cli.Command{
Name: "fetch-params",
Usage: "Fetch proving parameters",
Action: func(cctx *cli.Context) error {
if err := build.GetParams(true); err != nil {
return xerrors.Errorf("fetching proof parameters: %w", err)
}
return nil
},
}