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

Switch back to upstream faillint #7776

Merged
merged 4 commits into from
Apr 3, 2024
Merged

Switch back to upstream faillint #7776

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
ffeb877
Switch back to github.com/fatih/[email protected].
pstibrany Apr 2, 2024
0a6fecd
Fix whitespace.
pstibrany Apr 2, 2024
440715e
Update build image version to pr7776-bae88f6be5
pstibrany Apr 2, 2024
a484951
poke CI
pstibrany Apr 3, 2024
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions mimir-build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
Loading