From 2c549189352fc9473132d8db8c12a9d10b13331e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 11 May 2022 06:49:09 +0000 Subject: [PATCH 1/5] Disable exhaustruct linter --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index b444773..c6c67e9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,7 @@ task: - go mod tidy lint_script: - cd $(go env GOPATH)/src/github.com/$CIRRUS_REPO_FULL_NAME/ - - golangci-lint run --enable-all --disable gochecknoglobals,gomnd,interfacer $GOLANGCI_ARGS $GOLANGCI_MODULES_ARGS -v --timeout 5m --out-format json > $CIRRUS_WORKING_DIR/lint-report.json + - golangci-lint run --enable-all --disable exhaustruct,gochecknoglobals,gomnd,interfacer $GOLANGCI_ARGS $GOLANGCI_MODULES_ARGS -v --timeout 5m --out-format json > $CIRRUS_WORKING_DIR/lint-report.json matrix: - name: "Go Lint $GOOS New$MODULES_NAME" env: From 169683843808cc2c3458e56d4bd56239ee42816b Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 11 May 2022 07:06:27 +0000 Subject: [PATCH 2/5] Mark nonamedreturns linter as non-mandatory --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index c6c67e9..c9ec6a9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -60,7 +60,7 @@ task: - name: "Go Lint $GOOS Mandatory$MODULES_NAME" env: # TODO: Re-enable varnamelen after golangci-lint v1.44 is released. - GOLANGCI_ARGS: "--disable=cyclop,deadcode,errorlint,exhaustivestruct,forbidigo,forcetypeassert,funlen,gci,gocognit,gocritic,godot,godox,goerr113,gofumpt,goimports,golint,gosec,gosimple,govet,ineffassign,lll,maligned,nakedret,nestif,nilerr,nlreturn,paralleltest,revive,scopelint,staticcheck,stylecheck,thelper,unconvert,unparam,unused,varnamelen,wastedassign,whitespace,wrapcheck,wsl" + GOLANGCI_ARGS: "--disable=cyclop,deadcode,errorlint,exhaustivestruct,forbidigo,forcetypeassert,funlen,gci,gocognit,gocritic,godot,godox,goerr113,gofumpt,goimports,golint,gosec,gosimple,govet,ineffassign,lll,maligned,nakedret,nestif,nilerr,nlreturn,nonamedreturns,paralleltest,revive,scopelint,staticcheck,stylecheck,thelper,unconvert,unparam,unused,varnamelen,wastedassign,whitespace,wrapcheck,wsl" - name: "Go Lint $GOOS$MODULES_NAME" env: GOLANGCI_ARGS: "" From 7e46b7d2567d75eac5f577957c90dd002cbad771 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 11 May 2022 07:10:34 +0000 Subject: [PATCH 3/5] Disable execinquery linter --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index c9ec6a9..92a6ac2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,7 @@ task: - go mod tidy lint_script: - cd $(go env GOPATH)/src/github.com/$CIRRUS_REPO_FULL_NAME/ - - golangci-lint run --enable-all --disable exhaustruct,gochecknoglobals,gomnd,interfacer $GOLANGCI_ARGS $GOLANGCI_MODULES_ARGS -v --timeout 5m --out-format json > $CIRRUS_WORKING_DIR/lint-report.json + - golangci-lint run --enable-all --disable execinquery,exhaustruct,gochecknoglobals,gomnd,interfacer $GOLANGCI_ARGS $GOLANGCI_MODULES_ARGS -v --timeout 5m --out-format json > $CIRRUS_WORKING_DIR/lint-report.json matrix: - name: "Go Lint $GOOS New$MODULES_NAME" env: From 9c7589d64f721b2fbf2028e47cdcf2121fc59ab1 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 11 May 2022 07:27:39 +0000 Subject: [PATCH 4/5] Suppress errchkjson false positive --- certdehydrate/certdehydrate.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/certdehydrate/certdehydrate.go b/certdehydrate/certdehydrate.go index 8a048e1..7b01b85 100644 --- a/certdehydrate/certdehydrate.go +++ b/certdehydrate/certdehydrate.go @@ -79,7 +79,9 @@ func (dehydrated *DehydratedCertificate) SerialNumber(name string) ([]byte, erro func (dehydrated *DehydratedCertificate) String() string { output := []interface{}{1, dehydrated.PubkeyB64, dehydrated.NotBeforeScaled, dehydrated.NotAfterScaled, dehydrated.SignatureAlgorithm, dehydrated.SignatureB64} - binOutput, _ := json.Marshal(output) + // We don't need to check for errors, because json.Marshal is guaranteed to + // succeed for integer/string types. + binOutput, _ := json.Marshal(output) //nolint:errchkjson return string(binOutput) } From 37d7d99c5027a421f507ec1b47e5ecdfe94abd0e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 11 May 2022 07:40:36 +0000 Subject: [PATCH 5/5] Make "Modules Off" tasks non-mandatory until btcd is upgraded --- .cirrus.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 92a6ac2..c35646d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,6 +16,8 @@ task: GO111MODULE: "off" GOLANGCI_MODULES_ARGS: "--disable=gomoddirectives,gomodguard" MODULES_NAME: " Modules Off" + # TODO: Stop allowing failures once btcd v0.22.1 is released. + allow_failures: true fetch_script: - go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/... - GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/... @@ -109,6 +111,8 @@ task: - env: GO111MODULE: "off" MODULES_NAME: " Modules Off" + # TODO: Stop allowing failures once btcd v0.22.1 is released. + allow_failures: true fetch_script: - go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/... - GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/... @@ -175,6 +179,8 @@ task: - env: GO111MODULE: "off" MODULES_NAME: " Modules Off" + # TODO: Stop allowing failures once btcd v0.22.1 is released. + allow_failures: true gox_script: - go get github.com/mitchellh/gox fetch_script: