Skip to content

Commit

Permalink
chore: update protobuf, grpc-go, prototool
Browse files Browse the repository at this point in the history
To stay current.

Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
  • Loading branch information
AlekSi authored and talos-bot committed Jan 11, 2021
1 parent d19486a commit 275ca76
Show file tree
Hide file tree
Showing 14 changed files with 203 additions and 252 deletions.
18 changes: 9 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN cd $(mktemp -d) \
&& go mod init tmp \
&& go get mvdan.cc/gofumpt/gofumports@${GOFUMPT_VERSION} \
&& mv /go/bin/gofumports /toolchain/go/bin/gofumports
RUN curl -sfL https://github.com/uber/prototool/releases/download/v1.8.0/prototool-Linux-x86_64.tar.gz | tar -xz --strip-components=2 -C /toolchain/bin prototool/bin/prototool
RUN curl -sfL https://github.com/uber/prototool/releases/download/v1.10.0/prototool-Linux-x86_64.tar.gz | tar -xz --strip-components=2 -C /toolchain/bin prototool/bin/prototool
COPY ./hack/docgen /go/src/github.com/talos-systems/docgen
RUN cd /go/src/github.com/talos-systems/docgen \
&& go build . \
Expand Down Expand Up @@ -101,14 +101,14 @@ RUN go generate /pkg/machinery/config/types/v1alpha1/
WORKDIR /

FROM scratch AS generate
COPY --from=generate-build /api/common/common.pb.go /pkg/machinery/api/common/
COPY --from=generate-build /api/health/health.pb.go /pkg/machinery/api/health/
COPY --from=generate-build /api/security/security.pb.go /pkg/machinery/api/security/
COPY --from=generate-build /api/machine/machine.pb.go /pkg/machinery/api/machine/
COPY --from=generate-build /api/time/time.pb.go /pkg/machinery/api/time/
COPY --from=generate-build /api/network/network.pb.go /pkg/machinery/api/network/
COPY --from=generate-build /api/cluster/cluster.pb.go /pkg/machinery/api/cluster/
COPY --from=generate-build /api/storage/storage.pb.go /pkg/machinery/api/storage/
COPY --from=generate-build /api/common/*.pb.go /pkg/machinery/api/common/
COPY --from=generate-build /api/health/*.pb.go /pkg/machinery/api/health/
COPY --from=generate-build /api/security/*.pb.go /pkg/machinery/api/security/
COPY --from=generate-build /api/machine/*.pb.go /pkg/machinery/api/machine/
COPY --from=generate-build /api/time/*.pb.go /pkg/machinery/api/time/
COPY --from=generate-build /api/network/*.pb.go /pkg/machinery/api/network/
COPY --from=generate-build /api/cluster/*.pb.go /pkg/machinery/api/cluster/
COPY --from=generate-build /api/storage/*.pb.go /pkg/machinery/api/storage/
COPY --from=generate-build /pkg/machinery/config/types/v1alpha1/*_doc.go /pkg/machinery/config/types/v1alpha1/

# The base target provides a container that can be used to build all Talos
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ REGISTRY_AND_USERNAME := $(REGISTRY)/$(USERNAME)
DOCKER_LOGIN_ENABLED ?= true

ARTIFACTS := _out
TOOLS ?= ghcr.io/talos-systems/tools:v0.3.0-13-g05b7372
TOOLS ?= ghcr.io/talos-systems/tools:v0.3.0-16-g0fe682e
PKGS ?= v0.3.0-60-g2409ba7
EXTRAS ?= v0.1.0-6-gdc32cc8
GO_VERSION ?= 1.15
Expand Down
53 changes: 2 additions & 51 deletions go.sum

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions pkg/machinery/api/cluster/cluster.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkg/machinery/api/common/common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions pkg/machinery/api/health/health.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 275ca76

Please sign in to comment.