ci: generate golangci.yml with correct CEPH_VERSION

When building against go-ceph, the most recent version of Ceph is
assumed to be available (currently Octopus). In case an older version of
the development packages is installed, building go-ceph will fail.

Golangci-lint does not accept the `-tags nautilus` parameter like other
Golang tools. Instead, the build-constraints need to be configured in a
confguration file.

This change takes care of the following:
- move the current scripts/golangci.yml to a template
- add the @@CEPH_VERSION@@ substitute
- generate the configuration file when needed

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-07-02 14:05:42 +02:00 committed by mergify[bot]
parent 7a87db39e6
commit f9f9fba26c
3 changed files with 11 additions and 1 deletions

3
.gitignore vendored
View File

@ -14,3 +14,6 @@ deploy/cephcsi/image/cephcsi
*.orig *.orig
*.patch *.patch
*.rej *.rej
# generated golangci-lint configuration
scripts/golangci.yml

View File

@ -86,7 +86,10 @@ mod-check: check-env
@echo 'running: go mod verify' @echo 'running: go mod verify'
@go mod verify && [ "$(shell sha512sum go.mod)" = "`sha512sum go.mod`" ] || ( echo "ERROR: go.mod was modified by 'go mod verify'" && false ) @go mod verify && [ "$(shell sha512sum go.mod)" = "`sha512sum go.mod`" ] || ( echo "ERROR: go.mod was modified by 'go mod verify'" && false )
go-lint: scripts/golangci.yml: scripts/golangci.yml.in
sed "s/@@CEPH_VERSION@@/$(CEPH_VERSION)/g" < scripts/golangci.yml.in > scripts/golangci.yml
go-lint: scripts/golangci.yml
./scripts/lint-go.sh ./scripts/lint-go.sh
lint-extras: lint-extras:
@ -163,6 +166,7 @@ clean:
go clean -mod=vendor -r -x go clean -mod=vendor -r -x
rm -f deploy/cephcsi/image/cephcsi rm -f deploy/cephcsi/image/cephcsi
rm -f _output/cephcsi rm -f _output/cephcsi
$(RM) scripts/golangci.yml
$(RM) e2e.test $(RM) e2e.test
[ ! -f .devel-container-id ] || $(CONTAINER_CMD) rmi $(CSI_IMAGE_NAME):devel [ ! -f .devel-container-id ] || $(CONTAINER_CMD) rmi $(CSI_IMAGE_NAME):devel
$(RM) .devel-container-id $(RM) .devel-container-id

View File

@ -5,6 +5,9 @@
# options for analysis running # options for analysis running
run: run:
build-tags:
- @@CEPH_VERSION@@
# default concurrency is a available CPU number # default concurrency is a available CPU number
concurrency: 4 concurrency: 4