Switch back to upstream faillint (#7776)

* Switch back to github.com/fatih/[email protected]. * Fix whitespace. * Update build image version to pr7776-bae88f6be5 --------- Signed-off-by: Peter Štibraný <[email protected]>
grafana · Apr 3, 2024 · fee60b8 · fee60b8
1 parent c9529f6
commit fee60b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -242,7 +242,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
 # All the boiler plate for building golang follows:
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER ?= true
-LATEST_BUILD_IMAGE_TAG ?= pr7356-96b108aa4f
+LATEST_BUILD_IMAGE_TAG ?= pr7776-bae88f6be5
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile
@@ -42,13 +42,12 @@ RUN git clone --depth 1 --branch ${SKOPEO_VERSION} https://github.com/containers
     DISABLE_DOCS=1 make -C /go/src/github.com/containers/skopeo install && \
     rm -rf /go/pkg /go/src /root/.cache
 
-# github.com/pstibrany/faillint@update-deps-and-rename-mod is a fork of github.com/fatih/faillint with PR https://github.com/fatih/faillint/pull/41. Once it's merged, we should switch back.
 RUN GO111MODULE=on \
 	go install github.com/client9/misspell/cmd/[email protected] && \
 	go install github.com/golang/protobuf/[email protected] && \
 	go install github.com/gogo/protobuf/[email protected] && \
 	go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 && \
-	go install github.com/pstibrany/faillint@update-deps-and-rename-mod && \
+	go install github.com/fatih/faillint@v1.12.0 && \
 	go install github.com/campoy/[email protected] && \
 	go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected] && \
 	go install github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 && \