From 084eaada89ce8975bb750002e6eedb2073391f1e Mon Sep 17 00:00:00 2001 From: "Marcelo E. Magallon" Date: Fri, 8 Mar 2024 07:17:02 -0600 Subject: [PATCH] Update tools Signed-off-by: Marcelo E. Magallon --- Dockerfile | 8 ++++---- Dockerfile.tmpl | 2 +- versions.yaml | 22 ++++++++++++---------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e59703..6f8e391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,19 +13,19 @@ FROM go as tools RUN env GOBIN=/build go install github.com/google/wire/cmd/wire@v0.6.0 # Add bingo - RUN env GOBIN=/build go install github.com/bwplotka/bingo@v0.8.0 + RUN env GOBIN=/build go install github.com/bwplotka/bingo@v0.9.0 # Add enumer RUN env GOBIN=/build go install github.com/dmarkham/enumer@v1.5.9 # Add protoc-gen-go - RUN env GOBIN=/build go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0 + RUN env GOBIN=/build go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.33.0 # Add protoc-gen-go-grpc 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.29.0 + RUN env GOBIN=/build go install github.com/bufbuild/buf/cmd/buf@v1.30.0 # Add mage RUN git clone --depth 1 --branch v1.15.0 https://github.com/magefile/mage mage && \ @@ -45,7 +45,7 @@ FROM go as tools RUN env GOBIN=/build go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 # Add shellcheck - COPY --from=registry.hub.docker.com/koalaman/shellcheck:v0.9.0 /bin/shellcheck /build + COPY --from=registry.hub.docker.com/koalaman/shellcheck:v0.10.0 /bin/shellcheck /build # Add git-chglog RUN env GOBIN=/build go install github.com/git-chglog/git-chglog/cmd/git-chglog@v0.15.4 diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index af8b4bc..beb2e7f 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -22,7 +22,7 @@ FROM go as tools RUN env GOBIN=/build go install {{ .data.protobuf.repo }}/cmd/protoc-gen-go@{{ .data.protobuf.version }} # Add protoc-gen-go-grpc - RUN env GOBIN=/build go install {{ .data.grpc.repo }}/cmd/protoc-gen-go-grpc@{{ .data.grpc.version }} + RUN env GOBIN=/build go install {{ .data.grpc.repo }}@{{ .data.grpc.version }} # Add buf RUN env GOBIN=/build go install {{ .data.buf.repo }}/cmd/buf@{{ .data.buf.version }} diff --git a/versions.yaml b/versions.yaml index b968a28..ba187c9 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,10 +1,10 @@ bingo: repo: github.com/bwplotka/bingo - version: v0.8.0 + version: v0.9.0 type: go buf: repo: github.com/bufbuild/buf - version: v1.29.0 + version: v1.30.0 type: go enumer: repo: github.com/dmarkham/enumer @@ -27,15 +27,16 @@ gotestsum: version: v1.11.0 type: go grizzly: + comment: | + The last released version of grizzly doesn't build (uses replace + directives); we need to pin this to a commit until a new release is + available. + version: v0.2.1 repo: github.com/grafana/grizzly - # The last released version of grizzly doesn't build (uses replace - # directives); we need to pin this to a commit until a new release is - # available. - # version: v0.2.1 version: 5f301fd6c773 type: go grpc: - repo: google.golang.org/grpc + repo: google.golang.org/grpc/cmd/protoc-gen-go-grpc version: v1.3.0 type: go jq: @@ -55,13 +56,14 @@ mage: version: v1.15.0 type: go nilaway: + comment: | + This hasn't been released yet, so pin it to a specific version for reproducibility repo: go.uber.org/nilaway - # This hasn't been released yet, so pin it to a specific version for reproducibility version: v0.0.0-20240224031343-67945fb5199f type: go protobuf: repo: google.golang.org/protobuf - version: v1.32.0 + version: v1.33.0 type: go semversort: repo: github.com/whereswaldon/semversort @@ -69,7 +71,7 @@ semversort: type: go shellcheck: repo: registry.hub.docker.com/koalaman/shellcheck - version: v0.9.0 + version: v0.10.0 type: docker skopeo: repo: github.com/containers/skopeo