GODT-1833: Linter and pipeline fix after rebase.

This commit is contained in:
Jakub
2022-08-30 11:54:50 +02:00
parent 8592153c0f
commit 3c6f80e520
3 changed files with 4 additions and 5 deletions

View File

@ -108,8 +108,7 @@ test-integration:
dependency-updates:
stage: test
script:
- "echo 'NOTE: Do not run on go1.15 ( 'if...' can be removed once fully updated to go1.18)'"
- if [ 18 -le $(go version | cut -d. -f2 | cut -d " " -f1) ]; then make updates; fi
- make updates
# Stage: BUILD

View File

@ -171,7 +171,7 @@ ${RESOURCE_FILE}: ./dist/info.rc ./dist/${SRC_ICO} .FORCE
LINTVER:="v1.47.2"
LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
install-dev-dependencies: install-devel-tools install-linter
install-dev-dependencies: install-devel-tools install-linter install-go-mod-outdated
install-devel-tools: check-has-go
go get -v github.com/golang/mock/gomock
@ -182,7 +182,7 @@ install-linter: check-has-go
curl -sfL $(LINTSRC) | sh -s -- -b $(shell go env GOPATH)/bin $(LINTVER)
install-go-mod-outdated:
which go-mod-outdated || go get -u github.com/psampaz/go-mod-outdated
which go-mod-outdated || go install github.com/psampaz/go-mod-outdated@latest
install-git-hooks:
cp utils/githooks/* .git/hooks/

View File

@ -66,7 +66,7 @@ type Bridge struct {
lastVersion string
}
func New(
func New( //nolint:funlen
locations Locator,
cacheProvider CacheProvider,
setting SettingsProvider,