From fee60b8e96f0ca54f001f3e80016001e17f6f3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Wed, 3 Apr 2024 10:07:03 +0200 Subject: [PATCH] Switch back to upstream faillint (#7776) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Switch back to github.com/fatih/faillint@v1.12.0. * Fix whitespace. * Update build image version to pr7776-bae88f6be5 --------- Signed-off-by: Peter Štibraný --- Makefile | 2 +- mimir-build-image/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f7c8b3ea4a7..8c5e4c91cce 100644 --- 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 index a0dc3968dfc..802e676449b 100644 --- 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/misspell@v0.3.4 && \ go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 && \ go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 && \ 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/embedmd@v1.0.0 && \ go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.4.0 && \ go install github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 && \