Skip to content

Commit

Permalink
Update tools
Browse files Browse the repository at this point in the history
- golangci-lint v1.57.2
- skopeo v1.15.0
- buf v1.30.1
- k6 v0.50.0

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
  • Loading branch information
mem committed Apr 8, 2024
1 parent e0310cd commit 59c82d5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ FROM go as tools
RUN env GOBIN=/build go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0

# Add buf
RUN env GOBIN=/build go install github.com/bufbuild/buf/cmd/buf@v1.30.0
RUN env GOBIN=/build go install github.com/bufbuild/buf/cmd/buf@v1.30.1

# Add mage
RUN git clone --depth 1 --branch v1.15.0 https://github.com/magefile/mage mage && \
Expand All @@ -47,7 +47,7 @@ FROM go as tools
RUN env GOBIN=/build go install github.com/whereswaldon/semversort@v0.0.6

# Add golangci-lint
RUN env GOBIN=/build go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2
RUN env GOBIN=/build go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2

# Add shellcheck
COPY --from=registry.hub.docker.com/koalaman/shellcheck:v0.10.0 /bin/shellcheck /build
Expand All @@ -70,7 +70,7 @@ FROM go AS k6
# the architecture we are targeting. The simplest way to build k6 is to
# (ab)use xk6 to build a binary without any extensions. In the future, if
# we wanted additional extensions, this is the place to add them.
RUN /build/xk6 build v0.49.0 --output /build/k6
RUN /build/xk6 build v0.50.0 --output /build/k6

FROM registry.hub.docker.com/library/debian:stable-slim as skopeo

Expand All @@ -91,6 +91,7 @@ FROM registry.hub.docker.com/library/debian:stable-slim as skopeo
# inspect the available versions without pulling the repos.
RUN git clone https://github.com/containers/skopeo && \
cd skopeo && \
git checkout "v1.15.0" && \
make GOBIN=/build DISABLE_DOCS=1 bin/skopeo && \
mkdir -p /build && \
cp bin/skopeo /build/
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ FROM registry.hub.docker.com/library/debian:stable-slim as skopeo
# inspect the available versions without pulling the repos.
RUN git clone https://{{ .data.skopeo.repo }} && \
cd skopeo && \
git checkout "{{ .data.skopeo.version }}" && \
make GOBIN=/build DISABLE_DOCS=1 bin/skopeo && \
mkdir -p /build && \
cp bin/skopeo /build/
Expand Down
8 changes: 4 additions & 4 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bingo:
type: go
buf:
repo: github.com/bufbuild/buf
version: v1.30.0
version: v1.30.1
type: go
dockerfile-json:
repo: github.com/keilerkonzept/dockerfile-json
Expand All @@ -24,7 +24,7 @@ go:
type: docker
golangci-lint:
repo: github.com/golangci/golangci-lint
version: v1.56.2
version: v1.57.2
type: go
gotestsum:
repo: gotest.tools/gotestsum
Expand Down Expand Up @@ -53,7 +53,7 @@ jsonnet:
type: go
k6:
repo: github.com/grafana/k6
version: v0.49.0
version: v0.50.0
type: go
mage:
repo: github.com/magefile/mage
Expand All @@ -79,7 +79,7 @@ shellcheck:
type: docker
skopeo:
repo: github.com/containers/skopeo
version: v1.14.2
version: v1.15.0
type: go
wire:
repo: github.com/google/wire
Expand Down

0 comments on commit 59c82d5

Please sign in to comment.