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

Restore orijtech/structslop linter #1688

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Restore orijtech/structslop linter #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Forks:
| -------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | [`feat/go1.23` dev branch](https://github.com/atc0005/golangci-lint/tree/feat/go1.23) for `unstable` image |
| [`orijtech/httperroryzer`](https://github.com/atc0005/httperroryzer) | `54c26d99b9758117957285a790c2d88b51a552dd` (`stable`, `unstable` images) |
| [`orijtech/structslop`](https://github.com/atc0005/structslop) | `55db8be618045ec870098a4579bae376bbb7df33` (`stable` image) |
| [`orijtech/structslop`](https://github.com/atc0005/structslop) | `55db8be618045ec870098a4579bae376bbb7df33` (`stable`, `unstable` images) |
| [`orijtech/tickeryzer`](https://github.com/atc0005/tickeryzer) | `66a42ca5c152aced76c5186e92a4ae653440f02d` (`stable`, `unstable` images) |

## Build tools included
Expand Down
15 changes: 14 additions & 1 deletion unstable/combined/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ENV STATICCHECK_VERSION="v0.5.0-rc.1"
ENV DEADCODE_VERSION="v0.24.0"
ENV GOVULNCHECK_VERSION="v1.1.3"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV STRUCTSLOP_VERSION="v0.0.8"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.2"
ENV ERRWRAP_VERSION="v1.6.0"
Expand All @@ -39,6 +40,7 @@ ENV GOTESTDOX_VERSION="v0.2.2"
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="54c26d99b9758117957285a790c2d88b51a552dd"
ENV STRUCTSLOP_VERSION="55db8be618045ec870098a4579bae376bbb7df33"
ENV TICKERYZER_VERSION="66a42ca5c152aced76c5186e92a4ae653440f02d"
# ENV ERRWRAP_VERSION="c75521dd38c3bf43d1acaf3f628d87252fa69270"

Expand All @@ -50,6 +52,8 @@ RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
# && go install golang.org/x/vuln/cmd/govulncheck@${GOVULNCHECK_VERSION} \
# && echo "Installing httperroryzer@${HTTPERRORYZER_VERSION}" \
# && go install github.com/orijtech/httperroryzer/cmd/httperroryzer@${HTTPERRORYZER_VERSION} \
# && echo "Installing structslop@${STRUCTSLOP_VERSION}" \
# && go install github.com/orijtech/structslop/cmd/structslop@${STRUCTSLOP_VERSION} \
# && echo "Installing tickeryzer@${TICKERYZER_VERSION}" \
# && go install github.com/orijtech/tickeryzer/cmd/tickeryzer@${TICKERYZER_VERSION} \
# && echo "Installing tomll@${TOMLL_VERSION}" \
Expand All @@ -73,6 +77,14 @@ RUN echo "Installing httperroryzer from temporary fork" \
&& go install ./cmd/httperroryzer \
&& cd ..

# https://github.com/orijtech/structslop/issues/64
RUN echo "Installing structslop from temporary fork" \
&& git clone https://github.com/atc0005/structslop \
&& cd structslop \
&& git checkout ${STRUCTSLOP_VERSION} \
&& go install -ldflags=-checklinkname=0 ./cmd/structslop \
&& cd ..

RUN echo "Installing tickeryzer from temporary fork" \
&& git clone https://github.com/atc0005/tickeryzer \
&& cd tickeryzer \
Expand Down Expand Up @@ -137,11 +149,11 @@ ENV STATICCHECK_VERSION="v0.5.0-rc.1"
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="54c26d99b9758117957285a790c2d88b51a552dd"
ENV STRUCTSLOP_VERSION="55db8be618045ec870098a4579bae376bbb7df33"
ENV TICKERYZER_VERSION="66a42ca5c152aced76c5186e92a4ae653440f02d"

ENV DEADCODE_VERSION="v0.24.0"
ENV GOVULNCHECK_VERSION="v1.1.3"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
ENV TOMLL_VERSION="v2.2.2"
ENV ERRWRAP_VERSION="v1.6.0"
ENV GOTESTDOX_VERSION="v0.2.2"
Expand All @@ -164,6 +176,7 @@ COPY --from=builder /go/bin/govulncheck /usr/bin/govulncheck
COPY --from=builder /go/bin/deadcode /usr/bin/deadcode
COPY --from=builder /go/bin/gotestdox /usr/bin/gotestdox
COPY --from=builder /go/bin/httperroryzer /usr/bin/httperroryzer
COPY --from=builder /go/bin/structslop /usr/bin/structslop
COPY --from=builder /go/bin/tickeryzer /usr/bin/tickeryzer
COPY --from=builder /go/bin/tomll /usr/bin/tomll
COPY --from=builder /go/bin/errwrap /usr/bin/errwrap
Expand Down