Skip to content

Commit 2571505

Browse files
Make CI rules consistent, include pkg in test, and make start completion checking more intuitive
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
1 parent 2602ad6 commit 2571505

File tree

4 files changed

+69
-32
lines changed

4 files changed

+69
-32
lines changed

.golangci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@ linters-settings:
1212
values:
1313
regexp:
1414
COMPANY: .*
15+
YEAR: '\d\d\d\d(-\d\d\d\d)?'
1516
template: |-
1617
Copyright © {{ YEAR }} {{ COMPANY }}
17-
18+
1819
SPDX-License-Identifier: Apache-2.0
19-
20+
2021
Licensed under the Apache License, Version 2.0 (the "License");
2122
you may not use this file except in compliance with the License.
2223
You may obtain a copy of the License at
23-
24+
2425
http://www.apache.org/licenses/LICENSE-2.0
25-
26+
2627
Unless required by applicable law or agreed to in writing, software
2728
distributed under the License is distributed on an "AS IS" BASIS,
2829
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VGO=go
2-
GOFILES := $(shell find cmd internal -name '*.go' -print)
2+
GOFILES := $(shell find cmd pkg internal -name '*.go' -print)
33
GOBIN := $(shell $(VGO) env GOPATH)/bin
44
LINT := $(GOBIN)/golangci-lint
55
MOCKERY := $(GOBIN)/mockery
@@ -12,7 +12,7 @@ GOGC=30
1212

1313
all: build test go-mod-tidy
1414
test: deps lint
15-
$(VGO) test ./internal/... ./cmd/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s
15+
$(VGO) test ./pkg/... ./internal/... ./cmd/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s
1616
coverage.html:
1717
$(VGO) tool cover -html=coverage.txt
1818
coverage: test coverage.html

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ github.com/hyperledger/firefly-common v1.5.9 h1:Z1+SuKNYJ8hPKQ5CvcsMg6r/E4RyW6wb
104104
github.com/hyperledger/firefly-common v1.5.9/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs=
105105
github.com/hyperledger/firefly-signer v1.1.21 h1:r7cTOw6e/6AtiXLf84wZy6Z7zppzlc191HokW2hv4N4=
106106
github.com/hyperledger/firefly-signer v1.1.21/go.mod h1:axrlSQeKrd124UdHF5L3MkTjb5DeTcbJxJNCZ3JmcWM=
107-
github.com/hyperledger/firefly-transaction-manager v1.4.3-0.20251210154150-19fe03d63b4f h1:i38DovJn5Dmme2Ltye4iv51UEwLpWkzfcQ78lGC/i9k=
108-
github.com/hyperledger/firefly-transaction-manager v1.4.3-0.20251210154150-19fe03d63b4f/go.mod h1:1kbYt8ofDXqfwC02vwV/HoOjmiv0IuT9UkJ//bbrliE=
109107
github.com/hyperledger/firefly-transaction-manager v1.4.3 h1:/RltpJCIH8VsB8cTEICbGJkyc1CGPpJ2grG3kV+tdc8=
110108
github.com/hyperledger/firefly-transaction-manager v1.4.3/go.mod h1:1kbYt8ofDXqfwC02vwV/HoOjmiv0IuT9UkJ//bbrliE=
111109
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=

0 commit comments

Comments
 (0)