Skip to content

Commit

Permalink
loki-build-image: update faillint
Browse files Browse the repository at this point in the history
faillint needs an update for Go 1.19 where it fails unexpectedly. First
observed in grafana#7826.

See fatih/faillint#36
  • Loading branch information
rfratto committed Dec 2, 2022
1 parent 96fc2ab commit dbc84d0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {

[
pipeline('loki-build-image') {
local build_image_tag = '0.24.3',
local build_image_tag = '0.25.0',
workspace: {
base: '/src',
path: 'loki',
Expand Down
6 changes: 3 additions & 3 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
dry_run: true
repo: grafana/loki-build-image
tags:
- 0.24.3
- 0.25.0
when:
event:
- pull_request
Expand All @@ -26,7 +26,7 @@ steps:
from_secret: docker_password
repo: grafana/loki-build-image
tags:
- 0.24.3
- 0.25.0
username:
from_secret: docker_username
when:
Expand Down Expand Up @@ -1613,6 +1613,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 1abf633c26259d324da5804cd9fada3eacaf9b3184497f8b48ee29bad674b617
hmac: 053973b5cf1dd520bd742aab4e6e9e03367ecdcb871eebedac688dbd1a5fd9db

...
4 changes: 2 additions & 2 deletions loki-build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ RUN curl -L https://github.com/drone/drone-cli/releases/download/v1.4.0/drone_li
# Install faillint used to lint go imports in CI.
# This collisions with the version of go tools used in the base image, thus we install it in its own image and copy it over.
# Error:
# github.com/fatih/[email protected] requires golang.org/x/[email protected]
# github.com/fatih/[email protected] requires golang.org/x/[email protected]
# (not golang.org/x/[email protected] from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
FROM golang:1.19.2 as faillint
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.10.0
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.11.0

FROM golang:1.19.2 as delve
RUN GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest
Expand Down

0 comments on commit dbc84d0

Please sign in to comment.