Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump up golangci to 1.20 #1133

Merged
merged 4 commits into from
Oct 15, 2019
Merged

bump up golangci to 1.20 #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eed74c9
bump up golangci to 1.20
daixiang0 Oct 9, 2019
502ece9
Built and published 0.7.3. Updated all references
daixiang0 Oct 11, 2019
fa2591a
Removed concurrency limitation and added 5m timeout
joe-elliott Oct 15, 2019
fb8cf59
Upping concurrency to try to reduce lint time
joe-elliott Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ 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
depends_on:
- 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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -211,7 +211,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 #
Expand Down
2 changes: 1 addition & 1 deletion cmd/docker-driver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion cmd/loki-canary/Dockerfile.cross
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion cmd/loki/Dockerfile.cross
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion cmd/promtail/Dockerfile.cross
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion loki-build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down