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

Install golangci-lint from fork using dev branch #1591

Merged
merged 2 commits into from
Jun 26, 2024
Merged

Install golangci-lint from fork using dev branch #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca72569
Install golangci-lint from fork using dev branch
atc0005 Jun 26, 2024
e4445df
Note golangci-lint versions per img type
atc0005 Jun 26, 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
33 changes: 17 additions & 16 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,26 @@ others.
Unless indicated otherwise, the following linting tools are included in the
`go-ci-stable`, `go-ci-oldstable` and `go-ci-unstable` images:

| Linter | Version |
| --------------------------------------------------------------------- | --------------------------- |
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2023.1.7` (`v0.4.7`) |
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.59.1` |
| [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.2` |
| [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode) | `v0.22.0` |
| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` (`oldstable` only) |
| [`orijtech/structslop`](https://github.com/orijtech/structslop) | `v0.0.8` (`oldstable` only) |
| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer) | `v0.0.3` (`oldstable` only) |
| [`pelletier/go-toml`](https://github.com/pelletier/go-toml) | `v2.2.2` |
| [`fatih/errwrap`](https://github.com/fatih/errwrap) | `v1.6.0` |
| Linter | Version |
| --------------------------------------------------------------------- | ------------------------------------------- |
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2023.1.7` (`v0.4.7`) |
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.59.1` (`stable` and `oldstable` images) |
| [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.2` |
| [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode) | `v0.22.0` |
| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` (`oldstable` image) |
| [`orijtech/structslop`](https://github.com/orijtech/structslop) | `v0.0.8` (`oldstable` image) |
| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer) | `v0.0.3` (`oldstable` image) |
| [`pelletier/go-toml`](https://github.com/pelletier/go-toml) | `v2.2.2` |
| [`fatih/errwrap`](https://github.com/fatih/errwrap) | `v1.6.0` |

Forks:

| Linter | Version |
| -------------------------------------------------------------------- | ---------------------------------------------------------------------- |
| [`orijtech/httperroryzer`](https://github.com/atc0005/httperroryzer) | `54c26d99b9758117957285a790c2d88b51a552dd` (`stable`, `unstable` only) |
| [`orijtech/structslop`](https://github.com/atc0005/structslop) | `55db8be618045ec870098a4579bae376bbb7df33` (`stable` only) |
| [`orijtech/tickeryzer`](https://github.com/atc0005/tickeryzer) | `66a42ca5c152aced76c5186e92a4ae653440f02d` (`stable`, `unstable` only) |
| Linter | Version |
| -------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
| [`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/tickeryzer`](https://github.com/atc0005/tickeryzer) | `66a42ca5c152aced76c5186e92a4ae653440f02d` (`stable`, `unstable` images) |

## Build tools included

Expand Down
24 changes: 12 additions & 12 deletions unstable/combined/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ ENV GOTOOLCHAIN="local"
# A current dev branch build (mirrored to fork) is used for pre-release Go
# versions, otherwise the latest upstream build of the tool is installed in
# this image.
ENV GOLANGCI_LINT_VERSION="v1.59.1"
# ENV GOLANGCI_LINT_VERSION="v1.59.1"
ENV GOLANGCI_LINT_VERSION="feat/go1.23"

# A current master branch build is used for pre-release Go versions, otherwise
# the latest upstream build of the tool is installed in this image.
Expand Down Expand Up @@ -87,19 +88,18 @@ RUN echo "Installing errwrap@${ERRWRAP_VERSION}" \
# && go install . \
# && cd ..

# RUN echo "Installing golangci-lint from dev feat/go1.20 branch" \
# && git clone https://github.com/atc0005/golangci-lint \
# && cd golangci-lint \
# && git checkout ${GOLANGCI_LINT_VERSION} \
# && go install ./cmd/golangci-lint \
# && golangci-lint --version

RUN echo "Installing golangci-lint@${GOLANGCI_LINT_VERSION}" \
&& echo "Installing golangci-lint ${GOLANGCI_LINT_VERSION}" \
&& curl -sSfLO https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
&& sh install.sh -b "$(go env GOPATH)/bin" ${GOLANGCI_LINT_VERSION} \
RUN echo "Installing golangci-lint from dev feat/go1.23 branch" \
&& git clone https://github.com/atc0005/golangci-lint \
&& cd golangci-lint \
&& git checkout ${GOLANGCI_LINT_VERSION} \
&& go install ./cmd/golangci-lint \
&& golangci-lint --version

# RUN echo "Installing golangci-lint@${GOLANGCI_LINT_VERSION}" \
# && echo "Installing golangci-lint ${GOLANGCI_LINT_VERSION}" \
# && curl -sSfLO https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
# && sh install.sh -b "$(go env GOPATH)/bin" ${GOLANGCI_LINT_VERSION} \
# && golangci-lint --version

FROM amd64/golang:1.23rc1-bookworm as final

Expand Down