diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cff77eb2..ed32b8f72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,7 +157,7 @@ jobs: test-short: <<: *test - build_macos: + build-macos: description: build darwin lotus binary macos: xcode: "10.0.0" @@ -187,11 +187,11 @@ jobs: chmod +x $HOME/.bin/jq - restore_cache: name: restore go mod and cargo cache - key: v1-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.mod" }} + key: v2-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.mod" }} - install-deps - go/mod-download - run: - command: make build + command: make buildall no_output_timeout: 30m - store_artifacts: path: lotus @@ -199,9 +199,8 @@ jobs: path: lotus-storage-miner - save_cache: name: save go mod and cargo cache - key: v1-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.mod" }} + key: v2-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.mod" }} paths: - - "~/go/pkg" - "~/go/src/github.com" - "~/go/src/golang.org" - "~/.rustup" @@ -262,7 +261,4 @@ workflows: go-test-flags: "--timeout 10m --short" - mod-tidy-check - build-all - - build_macos: - filters: - branches: - only: master + - build-macos diff --git a/lib/sectorbuilder/fs.go b/lib/sectorbuilder/fs.go index fa0734368..e427e8014 100644 --- a/lib/sectorbuilder/fs.go +++ b/lib/sectorbuilder/fs.go @@ -98,7 +98,7 @@ func (f *fs) reserve(typ dataType, size uint64) error { types.NewInt(need).SizeStr(), types.NewInt(uint64(avail)).SizeStr(), types.NewInt(uint64(fsavail)).SizeStr(), - types.NewInt(uint64(f.reservedBytes()))) + types.NewInt(uint64(f.reservedBytes())).SizeStr()) } f.reserved[typ] += need