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

Remove errwrap from oldstable image #285

Merged
merged 1 commit into from
Mar 26, 2021
Merged

Remove errwrap from oldstable image #285

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
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ is useful to others.

## Linting tools included

| Linter | Version |
| --------------------------------------------------------------------- | --------------------- |
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2020.2.3` (`v0.1.3`) |
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.39.0` |
| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` |
| [`orijtech/structslop`](https://github.com/orijtech/structslop) | `v0.0.6` |
| [`pelletier/go-toml/cmd/tomll`](https://github.com/pelletier/go-toml) | `v1.8.1` |
| [`fatih/errwrap`](https://github.com/fatih/errwrap) | `v1.3.1` |
| Linter | Version |
| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
| [`staticcheck`](https://github.com/dominikh/go-tools) | `2020.2.3` (`v0.1.3`) |
| [`golangci-lint`](https://github.com/golangci/golangci-lint) | `v1.39.0` |
| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` |
| [`orijtech/structslop`](https://github.com/orijtech/structslop) | `v0.0.6` |
| [`pelletier/go-toml/cmd/tomll`](https://github.com/pelletier/go-toml) | `v1.8.1` |
| [`fatih/errwrap`](https://github.com/fatih/errwrap) | `v1.3.1` ([omitted from `oldstable` image](https://github.com/atc0005/go-ci/issues/280)) |

## Docker images

Expand Down
8 changes: 6 additions & 2 deletions oldstable/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ ENV STATICCHECK_VERSION="v0.1.3"
ENV HTTPERRORYZER_VERSION="v0.0.1"
ENV STRUCTSLOP_VERSION="v0.0.6"
ENV TOMLL_VERSION="v1.8.1"
ENV ERRWRAP_VERSION="v1.3.1"

# TODO: Re-enable once Go 1.17 is released and 1.16 is then the "oldstable" release
# ENV ERRWRAP_VERSION="v1.3.1"

ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"
Expand All @@ -34,9 +36,11 @@ RUN GO111MODULE="on" go get honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VER
&& GO111MODULE="on" go get github.com/orijtech/httperroryzer/cmd/httperroryzer@${HTTPERRORYZER_VERSION} \
&& GO111MODULE="on" go get github.com/orijtech/structslop/cmd/structslop@${STRUCTSLOP_VERSION} \
&& GO111MODULE="on" go get github.com/pelletier/go-toml/cmd/tomll@${TOMLL_VERSION} \
&& GO111MODULE="on" go get github.com/fatih/errwrap@${ERRWRAP_VERSION} \
&& go clean -cache -modcache

# TODO: Re-enable once Go 1.17 is released and 1.16 is then the "oldstable" release
# && GO111MODULE="on" go get github.com/fatih/errwrap@${ERRWRAP_VERSION} \

# Copy over linting config files to root of container to serve as a default.
# Projects bringing their own config files (e.g., via GitHub Actions) can
# easily override these files, while projects choosing to use these config
Expand Down