diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 4 | ||||
| -rw-r--r-- | hack/install_golangci.sh | 5 |
3 files changed, 8 insertions, 16 deletions
@@ -481,7 +481,7 @@ uninstall: GIT_CHECK_EXCLUDE="./vendor:docs/make.bat" $(GOBIN)/git-validation -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD) .PHONY: install.tools -install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo .install.golangci-lint ## Install needed tools +install.tools: .install.gitvalidation .install.md2man .install.ginkgo .install.golangci-lint ## Install needed tools define go-get env GO111MODULE=off \ @@ -498,19 +498,8 @@ endef $(call go-get,github.com/vbatts/git-validation); \ fi -.install.gometalinter: .gopathok - if [ ! -x "$(GOBIN)/gometalinter" ]; then \ - $(call go-get,github.com/alecthomas/gometalinter); \ - cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \ - git checkout --detach e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \ - $(GO) install github.com/alecthomas/gometalinter; \ - $(GOBIN)/gometalinter --install; \ - fi - .install.golangci-lint: .gopathok - if [ ! -x "$(GOBIN)/golangci-lint" ]; then \ - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOBIN)/ v1.18.0; \ - fi + VERSION=1.18.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh .install.md2man: .gopathok if [ ! -x "$(GOMD2MAN)" ]; then \ diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 1939d7ad1..c6aacead5 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -1,6 +1,5 @@ -FROM fedora:30 +FROM fedora:31 RUN dnf -y install \ - atomic-registries \ btrfs-progs-devel \ bzip2 \ container-selinux \ @@ -46,7 +45,6 @@ WORKDIR $GOSRC # Install dependencies RUN set -x && \ - make install.tools && \ install -D -m 755 $GOSRC/contrib/gate/entrypoint.sh /usr/local/bin/ && \ rm -rf "$GOSRC" diff --git a/hack/install_golangci.sh b/hack/install_golangci.sh new file mode 100644 index 000000000..9d23bbd31 --- /dev/null +++ b/hack/install_golangci.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e +$GOBIN/golangci-lint --version | grep $VERSION +if [ $? -ne 0 ]; then + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOBIN v$VERSION +fi |