From 920d0c9e0ae0c74914a02c04869968a9993d4efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 4 Jan 2023 15:16:40 +0100 Subject: [PATCH] feat: ci: show gen diff more clearly in gen checks --- .circleci/config.yml | 12 +++--------- .circleci/template.yml | 12 +++--------- api/api_full.go | 2 +- cmd/lotus/daemon.go | 2 +- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 292f778fc..d690a6d54 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -393,11 +393,9 @@ jobs: - run: go install golang.org/x/tools/cmd/goimports - run: go install github.com/hannahhoward/cbor-gen-for - run: make gen - - run: git --no-pager diff - - run: git --no-pager diff --quiet + - run: git --no-pager diff && git --no-pager diff --quiet - run: make docsgen-cli - - run: git --no-pager diff - - run: git --no-pager diff --quiet + - run: git --no-pager diff && git --no-pager diff --quiet docs-check: executor: golang @@ -412,11 +410,7 @@ jobs: - run: zcat build/openrpc/full.json.gz | jq > ../post-openrpc-full - run: zcat build/openrpc/miner.json.gz | jq > ../post-openrpc-miner - run: zcat build/openrpc/worker.json.gz | jq > ../post-openrpc-worker - - run: git --no-pager diff - - run: diff ../pre-openrpc-full ../post-openrpc-full - - run: diff ../pre-openrpc-miner ../post-openrpc-miner - - run: diff ../pre-openrpc-worker ../post-openrpc-worker - - run: git --no-pager diff --quiet + - run: diff ../pre-openrpc-full ../post-openrpc-full && diff ../pre-openrpc-miner ../post-openrpc-miner && diff ../pre-openrpc-worker ../post-openrpc-worker && git --no-pager diff && git --no-pager diff --quiet lint: &lint description: | diff --git a/.circleci/template.yml b/.circleci/template.yml index 58a91114b..6906f13f4 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -393,11 +393,9 @@ jobs: - run: go install golang.org/x/tools/cmd/goimports - run: go install github.com/hannahhoward/cbor-gen-for - run: make gen - - run: git --no-pager diff - - run: git --no-pager diff --quiet + - run: git --no-pager diff && git --no-pager diff --quiet - run: make docsgen-cli - - run: git --no-pager diff - - run: git --no-pager diff --quiet + - run: git --no-pager diff && git --no-pager diff --quiet docs-check: executor: golang @@ -412,11 +410,7 @@ jobs: - run: zcat build/openrpc/full.json.gz | jq > ../post-openrpc-full - run: zcat build/openrpc/miner.json.gz | jq > ../post-openrpc-miner - run: zcat build/openrpc/worker.json.gz | jq > ../post-openrpc-worker - - run: git --no-pager diff - - run: diff ../pre-openrpc-full ../post-openrpc-full - - run: diff ../pre-openrpc-miner ../post-openrpc-miner - - run: diff ../pre-openrpc-worker ../post-openrpc-worker - - run: git --no-pager diff --quiet + - run: diff ../pre-openrpc-full ../post-openrpc-full && diff ../pre-openrpc-miner ../post-openrpc-miner && diff ../pre-openrpc-worker ../post-openrpc-worker && git --no-pager diff && git --no-pager diff --quiet lint: &lint description: | diff --git a/api/api_full.go b/api/api_full.go index 0c281c12d..7bdd41fb2 100644 --- a/api/api_full.go +++ b/api/api_full.go @@ -727,7 +727,7 @@ type FullNode interface { // MethodGroup: Paych // The Paych methods are for interacting with and managing payment channels - // PaychGet gets or creates a payment channel between address pair + // PaychGet gets or creates a payment channel between address pair (test change) // The specified amount will be reserved for use. If there aren't enough non-reserved funds // available, funds will be added through an on-chain message. // - When opts.OffChain is true, this call will not cause any messages to be sent to the chain (no automatic diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index 59f9d7258..5925dc417 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -80,7 +80,7 @@ var daemonStopCmd = &cli.Command{ // DaemonCmd is the `go-lotus daemon` command var DaemonCmd = &cli.Command{ Name: "daemon", - Usage: "Start a lotus daemon process", + Usage: "Start a lotus daemon process (test change)", Flags: []cli.Flag{ &cli.StringFlag{ Name: "api",