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.

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

Remove abandoned orijtech/tickeryzer linter #1847

Merged
merged 1 commit into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ Forks:
| Linter | Version |
| -------------------------------------------------------------------- | ------------------------------------------ |
| [`orijtech/httperroryzer`](https://github.com/atc0005/httperroryzer) | `9f94717820d4a5075117680de2ca07875d32c9f1` |
| [`orijtech/tickeryzer`](https://github.com/atc0005/tickeryzer) | `b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f` |

## Build tools included

Expand Down Expand Up @@ -428,7 +427,6 @@ each release of this project.
- [deadcode](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode)
- Additional
- [orijtech/httperroryzer](https://github.com/orijtech/httperroryzer)
- [orijtech/tickeryzer](https://github.com/orijtech/tickeryzer)
- [pelletier/go-toml](https://github.com/pelletier/go-toml)
- Build Tools
- [tc-hib/go-winres](https://github.com/tc-hib/go-winres)
Expand Down
12 changes: 0 additions & 12 deletions oldstable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@ ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.29.0"
ENV GOVULNCHECK_VERSION="v1.1.4"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.3"
ENV GOTESTDOX_VERSION="v0.2.2"

# These commits/versions are provided by temporary forks of the upstream
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"

RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
&& go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VERSION} \
Expand Down Expand Up @@ -58,14 +56,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
&& go version -m $(which httperroryzer) \
&& cd ..

RUN echo "Installing tickeryzer from temporary fork" \
&& git clone https://github.com/atc0005/tickeryzer \
&& cd tickeryzer \
&& git checkout ${TICKERYZER_VERSION} \
&& go install ./cmd/tickeryzer \
&& go version -m $(which tickeryzer) \
&& cd ..

# RUN echo "Installing golangci-lint from dev feat/go1.20 branch" \
# && git clone https://github.com/atc0005/golangci-lint \
# && cd golangci-lint \
Expand Down Expand Up @@ -109,7 +99,6 @@ 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="9f94717820d4a5075117680de2ca07875d32c9f1"
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"

ENV APT_BSDMAINUTILS_VERSION="12.1.8"
ENV APT_TREE_VERSION="2.1.0-1"
Expand All @@ -129,7 +118,6 @@ 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/tickeryzer /usr/bin/tickeryzer
COPY --from=builder /go/bin/tomll /usr/bin/tomll

# Copy over linting config files to root of container image to serve as a
Expand Down
13 changes: 0 additions & 13 deletions stable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.29.0"
ENV GOVULNCHECK_VERSION="v1.1.4"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.3"
ENV GOTESTDOX_VERSION="v0.2.2"

# These commits/versions are provided by temporary forks of the upstream
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"

RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
&& go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VERSION} \
Expand Down Expand Up @@ -69,14 +67,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
&& go version -m $(which httperroryzer) \
&& cd ..

RUN echo "Installing tickeryzer from temporary fork" \
&& git clone https://github.com/atc0005/tickeryzer \
&& cd tickeryzer \
&& git checkout ${TICKERYZER_VERSION} \
&& go install ./cmd/tickeryzer \
&& go version -m $(which tickeryzer) \
&& cd ..

# RUN echo "Installing golangci-lint from dev feat/go1.20 branch" \
# && git clone https://github.com/atc0005/golangci-lint \
# && cd golangci-lint \
Expand Down Expand Up @@ -123,15 +113,13 @@ ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.29.0"
ENV GOVULNCHECK_VERSION="v1.1.4"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.3"
ENV GOTESTDOX_VERSION="v0.2.2"

# These commits/versions are provided by temporary forks of the upstream
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"

ENV APT_BSDMAINUTILS_VERSION="12.1.8"
ENV APT_TREE_VERSION="2.1.0-1"
Expand All @@ -151,7 +139,6 @@ 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/tickeryzer /usr/bin/tickeryzer
COPY --from=builder /go/bin/tomll /usr/bin/tomll

# Copy over linting config files to root of container image to serve as a
Expand Down
3 changes: 0 additions & 3 deletions tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ require (
// httperroryzer - provided as an optional linter
github.com/orijtech/httperroryzer v0.0.1

// tickeryzer - provided as an optional linter
github.com/orijtech/tickeryzer v0.0.3

// tomll - provided as an optional linter
github.com/pelletier/go-toml/v2 v2.2.3

Expand Down
2 changes: 0 additions & 2 deletions tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/orijtech/httperroryzer v0.0.1 h1:85v2h0lGsa4X1DvOpuMmR+mimG7bGYYRbOWTmE/YOi4=
github.com/orijtech/httperroryzer v0.0.1/go.mod h1:j1TGk7yN1XWUoNrjJTs8V+FNmonAdmfjJJvbt2fOTxs=
github.com/orijtech/tickeryzer v0.0.3 h1:voYEdZlzcvMTT3E2LoWIy4s0O74n4Z5L5C22cXJsANo=
github.com/orijtech/tickeryzer v0.0.3/go.mod h1:PS87zBzREYa3A0JGhIIQXvPiNeH44TjLRi4O+x4fOxc=
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
Expand Down
1 change: 0 additions & 1 deletion tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
_ "github.com/golangci/golangci-lint/pkg/config"
_ "github.com/goreleaser/nfpm/v2"
_ "github.com/orijtech/httperroryzer"
_ "github.com/orijtech/tickeryzer"
_ "github.com/pelletier/go-toml/v2"
_ "github.com/tc-hib/go-winres"
_ "golang.org/x/tools/cmd/deadcode"
Expand Down
13 changes: 0 additions & 13 deletions unstable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@ ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.29.0"
ENV GOVULNCHECK_VERSION="v1.1.4"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.3"
ENV GOTESTDOX_VERSION="v0.2.2"

# These commits/versions are provided by temporary forks of the upstream
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"

RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
&& go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VERSION} \
Expand Down Expand Up @@ -68,14 +66,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
&& go install ./cmd/httperroryzer \
&& cd ..

RUN echo "Installing tickeryzer from temporary fork" \
&& git clone https://github.com/atc0005/tickeryzer \
&& cd tickeryzer \
&& git checkout ${TICKERYZER_VERSION} \
&& go install ./cmd/tickeryzer \
&& go version -m $(which tickeryzer) \
&& cd ..

# RUN echo "Installing golangci-lint from dev feat/go1.23 branch" \
# && git clone https://github.com/atc0005/golangci-lint \
# && cd golangci-lint \
Expand Down Expand Up @@ -123,15 +113,13 @@ ENV STATICCHECK_VERSION="v0.5.1"
ENV DEADCODE_VERSION="v0.29.0"
ENV GOVULNCHECK_VERSION="v1.1.4"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.3"
ENV GOTESTDOX_VERSION="v0.2.2"

# These commits/versions are provided by temporary forks of the upstream
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"

ENV APT_BSDMAINUTILS_VERSION="12.1.8"
ENV APT_TREE_VERSION="2.1.0-1"
Expand All @@ -151,7 +139,6 @@ 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/tickeryzer /usr/bin/tickeryzer
COPY --from=builder /go/bin/tomll /usr/bin/tomll

# Copy over linting config files to root of container image to serve as a
Expand Down
Loading