cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Steamline build jobs

Browse Source 
- Removes cargo caching (since we don't build FFI from source, this
isn't used)
- Removes npm (this isn't a build dependency, so not sure why it was
  being installed)
This commit is contained in:
Ian Davis 2022-11-07 16:13:00 +00:00
parent 2895dcfa98
commit bc06775e04
2 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.circleci/config.yml
View File

@ -300,8 +300,6 @@ jobs:
executor: golang executor: golang
steps: steps:
- prepare - prepare
- run: sudo apt-get update
- run: sudo apt-get install npm
- run: make lotus lotus-miner lotus-worker - run: make lotus lotus-miner lotus-worker
- run: - run:
name: check tag and version output match name: check tag and version output match
@ -323,10 +321,10 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
- restore_cache:
name: restore cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
- run: make lotus lotus-miner lotus-worker - run: make lotus lotus-miner lotus-worker
- run:
name: check tag and version output match
command: ./scripts/version-check.sh ./lotus
- run: | - run: |
mkdir -p /tmp/workspace/darwin_amd64_v1 && \ mkdir -p /tmp/workspace/darwin_amd64_v1 && \
mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_amd64_v1/ mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_amd64_v1/
@ -334,12 +332,6 @@ jobs:
root: /tmp/workspace root: /tmp/workspace
paths: paths:
- darwin_amd64_v1 - darwin_amd64_v1
- save_cache:
name: save cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
paths:
- "~/.rustup"
- "~/.cargo"
build-darwin-arm64: build-darwin-arm64:
description: self-hosted m1 runner description: self-hosted m1 runner
@ -351,13 +343,13 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
- restore_cache:
name: restore cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
- run: | - run: |
export CPATH=$(brew --prefix)/include export CPATH=$(brew --prefix)/include
export LIBRARY_PATH=$(brew --prefix)/lib export LIBRARY_PATH=$(brew --prefix)/lib
make lotus lotus-miner lotus-worker make lotus lotus-miner lotus-worker
- run:
name: check tag and version output match
command: ./scripts/version-check.sh ./lotus
- run: | - run: |
mkdir -p /tmp/workspace/darwin_arm64 && \ mkdir -p /tmp/workspace/darwin_arm64 && \
mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_arm64/ mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_arm64/
@ -365,12 +357,6 @@ jobs:
root: /tmp/workspace root: /tmp/workspace
paths: paths:
- darwin_arm64 - darwin_arm64
- save_cache:
name: save cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
paths:
- "~/.rustup"
- "~/.cargo"
- run: - run:
command: make clean command: make clean
when: always when: always

26
.circleci/template.yml
View File

@ -300,8 +300,6 @@ jobs:
executor: golang executor: golang
steps: steps:
- prepare - prepare
- run: sudo apt-get update
- run: sudo apt-get install npm
- run: make lotus lotus-miner lotus-worker - run: make lotus lotus-miner lotus-worker
- run: - run:
name: check tag and version output match name: check tag and version output match
@ -323,10 +321,10 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
- restore_cache:
name: restore cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
- run: make lotus lotus-miner lotus-worker - run: make lotus lotus-miner lotus-worker
- run:
name: check tag and version output match
command: ./scripts/version-check.sh ./lotus
- run: | - run: |
mkdir -p /tmp/workspace/darwin_amd64_v1 && \ mkdir -p /tmp/workspace/darwin_amd64_v1 && \
mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_amd64_v1/ mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_amd64_v1/
@ -334,12 +332,6 @@ jobs:
root: /tmp/workspace root: /tmp/workspace
paths: paths:
- darwin_amd64_v1 - darwin_amd64_v1
- save_cache:
name: save cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
paths:
- "~/.rustup"
- "~/.cargo"
build-darwin-arm64: build-darwin-arm64:
description: self-hosted m1 runner description: self-hosted m1 runner
@ -351,13 +343,13 @@ jobs:
- prepare: - prepare:
linux: false linux: false
darwin: true darwin: true
- restore_cache:
name: restore cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
- run: | - run: |
export CPATH=$(brew --prefix)/include export CPATH=$(brew --prefix)/include
export LIBRARY_PATH=$(brew --prefix)/lib export LIBRARY_PATH=$(brew --prefix)/lib
make lotus lotus-miner lotus-worker make lotus lotus-miner lotus-worker
- run:
name: check tag and version output match
command: ./scripts/version-check.sh ./lotus
- run: | - run: |
mkdir -p /tmp/workspace/darwin_arm64 && \ mkdir -p /tmp/workspace/darwin_arm64 && \
mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_arm64/ mv lotus lotus-miner lotus-worker /tmp/workspace/darwin_arm64/
@ -365,12 +357,6 @@ jobs:
root: /tmp/workspace root: /tmp/workspace
paths: paths:
- darwin_arm64 - darwin_arm64
- save_cache:
name: save cargo cache
key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
paths:
- "~/.rustup"
- "~/.cargo"
- run: - run:
command: make clean command: make clean
when: always when: always