From b6faee205a92ec4550796bfa93be0d463b4bbac9 Mon Sep 17 00:00:00 2001 From: Xiang Dai <764524258@qq.com> Date: Wed, 16 Oct 2019 02:24:56 +0800 Subject: [PATCH] bump up golangci to 1.20 (#1133) * bump up golangci to 1.20 Signed-off-by: Xiang Dai <764524258@qq.com> * Built and published 0.7.3. Updated all references Signed-off-by: Joe Elliott Signed-off-by: Xiang Dai <764524258@qq.com> * Removed concurrency limitation and added 5m timeout Signed-off-by: Joe Elliott * Upping concurrency to try to reduce lint time Signed-off-by: Joe Elliott Co-authored-by: Xiang Dai <764524258@qq.com> Co-authored-by: Joe Elliott --- .circleci/config.yml | 2 +- .drone/drone.yml | 10 +++++----- Makefile | 4 ++-- cmd/docker-driver/Dockerfile | 2 +- cmd/loki-canary/Dockerfile.cross | 2 +- cmd/loki/Dockerfile.cross | 2 +- cmd/promtail/Dockerfile.cross | 2 +- loki-build-image/Dockerfile | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb2b22a7f591..eceaf0baaf49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ workflows: # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/ .defaults: &defaults docker: - - image: grafana/loki-build-image:0.7.2 + - image: grafana/loki-build-image:0.7.3 working_directory: /src/loki jobs: diff --git a/.drone/drone.yml b/.drone/drone.yml index dd0be8dcf91b..66906d1a85b8 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -5,19 +5,19 @@ steps: - make BUILD_IN_CONTAINER=false test depends_on: - clone - image: grafana/loki-build-image:0.7.2 + image: grafana/loki-build-image:0.7.3 name: test - commands: - make BUILD_IN_CONTAINER=false lint depends_on: - clone - image: grafana/loki-build-image:0.7.2 + image: grafana/loki-build-image:0.7.3 name: lint - commands: - make BUILD_IN_CONTAINER=false check-generated-files depends_on: - clone - image: grafana/loki-build-image:0.7.2 + image: grafana/loki-build-image:0.7.3 name: check-generated-files - commands: - make BUILD_IN_CONTAINER=false check-mod @@ -25,7 +25,7 @@ steps: - clone - test - lint - image: grafana/loki-build-image:0.7.2 + image: grafana/loki-build-image:0.7.3 name: check-mod workspace: base: /src @@ -492,7 +492,7 @@ steps: environment: CIRCLE_TOKEN: from_secret: circle_token - image: grafana/loki-build-image:0.7.2 + image: grafana/loki-build-image:0.7.3 name: trigger trigger: ref: diff --git a/Makefile b/Makefile index 99e734677af3..11e69c5d8bad 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ IMAGE_NAMES := $(foreach dir,$(DOCKER_IMAGE_DIRS),$(patsubst %,$(IMAGE_PREFIX)%, # make BUILD_IN_CONTAINER=false target # or you can override this with an environment variable BUILD_IN_CONTAINER ?= true -BUILD_IMAGE_VERSION := 0.7.2 +BUILD_IMAGE_VERSION := 0.7.3 # Docker image info IMAGE_PREFIX ?= grafana @@ -212,7 +212,7 @@ publish: dist ######## lint: - GO111MODULE=on GOGC=10 golangci-lint run -j 4 + GO111MODULE=on GOGC=10 golangci-lint run --timeout=5m -j 16 ######## # Test # diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile index 2b1ec2f013bd..1b7baeedcc6b 100644 --- a/cmd/docker-driver/Dockerfile +++ b/cmd/docker-driver/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.7.2 +ARG BUILD_IMAGE=grafana/loki-build-image:0.7.3 # Directories in this file are referenced from the root of the project not this folder # This file is intented to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile . diff --git a/cmd/loki-canary/Dockerfile.cross b/cmd/loki-canary/Dockerfile.cross index acd4a10e3a5e..5e42d8a921c0 100644 --- a/cmd/loki-canary/Dockerfile.cross +++ b/cmd/loki-canary/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.7.2 +ARG BUILD_IMAGE=grafana/loki-build-image:0.7.3 # Directories in this file are referenced from the root of the project not this folder # This file is intented to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile . diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross index 577c81661ddd..ad9fb0d16c65 100644 --- a/cmd/loki/Dockerfile.cross +++ b/cmd/loki/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.7.2 +ARG BUILD_IMAGE=grafana/loki-build-image:0.7.3 # Directories in this file are referenced from the root of the project not this folder # This file is intented to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile . diff --git a/cmd/promtail/Dockerfile.cross b/cmd/promtail/Dockerfile.cross index 53ee6bccc26f..334fcde96295 100644 --- a/cmd/promtail/Dockerfile.cross +++ b/cmd/promtail/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.7.2 +ARG BUILD_IMAGE=grafana/loki-build-image:0.7.3 # Directories in this file are referenced from the root of the project not this folder # This file is intented to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile . diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile index 8a0e9a75f0c0..6a9e86b5bbe2 100644 --- a/loki-build-image/Dockerfile +++ b/loki-build-image/Dockerfile @@ -9,7 +9,7 @@ RUN apk add --no-cache curl && \ FROM alpine as golangci RUN apk add --no-cache curl && \ cd / && \ - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.19.1 + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.20.0 FROM alpine:edge as docker RUN apk add --no-cache docker-cli