Merge pull request #1847 from atc0005/i1846-remove-abandoned-orijtech…

…-tickeryzer-linter Remove abandoned orijtech/tickeryzer linter
atc0005 · Jan 15, 2025 · 0959335 · 0959335
2 parents bd44ab1 + 061c7d7
commit 0959335
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -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
 
@@ -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)

diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile
@@ -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} \
@@ -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 \
@@ -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"
@@ -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

diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile
@@ -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} \
@@ -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 \
@@ -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"
@@ -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

diff --git a/tools/go.mod b/tools/go.mod
@@ -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
 

diff --git a/tools/go.sum b/tools/go.sum
@@ -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=

diff --git a/tools/tools.go b/tools/tools.go
@@ -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"

diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile
@@ -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} \
@@ -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 \
@@ -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"
@@ -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