Skip to content
This repository was archived by the owner on Mar 4, 2022. It is now read-only.

Commit 0f1ebbc

Browse files
author
Steve Ayers
committed
Merge branch 'dev'
2 parents 3aeb7f7 + 1be33fe commit 0f1ebbc

File tree

175 files changed

+1140
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+1140
-354
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/.idea
33
/.tmp
44
/.vscode
5+
/prototool
56
/bazel-*
67
/brew
78
/etc/docker/testing/gen

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## [1.9.0] - 2019-10-12
7+
## [Unreleased]
88
- No changes yet.
99

1010

11+
## [1.9.0] - 2019-10-12
12+
- Updated dependencies for Go 1.13
13+
14+
1115
## [1.8.0] - 2019-06-10
1216
- Update the default `protoc` version to `3.8.0`.
1317
- Parse updated `protoc` output for `3.8.0`.
@@ -248,6 +252,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
248252
### Added
249253
- Initial release.
250254

255+
[Unreleased]: https://github.com/uber/prototool/compare/v1.9.0...HEAD
251256
[1.9.0]: https://github.com/uber/prototool/compare/v1.8.0...v1.9.0
252257
[1.8.0]: https://github.com/uber/prototool/compare/v1.7.0...v1.8.0
253258
[1.7.0]: https://github.com/uber/prototool/compare/v1.6.0...v1.7.0

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.4-alpine3.9 as builder
1+
FROM golang:1.14-alpine3.11 as builder
22

33
RUN apk add --update --no-cache build-base curl git upx && \
44
rm -rf /var/cache/apk/*
@@ -67,17 +67,17 @@ RUN cd /tmp/prototool && \
6767

6868
RUN upx --lzma /usr/local/bin/*
6969

70-
FROM alpine:edge
70+
FROM alpine:latest
7171

7272
WORKDIR /work
7373

7474
ENV \
7575
PROTOTOOL_PROTOC_BIN_PATH=/usr/bin/protoc \
7676
PROTOTOOL_PROTOC_WKT_PATH=/usr/include \
77-
GRPC_VERSION=1.21.3 \
78-
PROTOBUF_VERSION=3.8.0 \
79-
ALPINE_GRPC_VERSION_SUFFIX=r0 \
80-
ALPINE_PROTOBUF_VERSION_SUFFIX=r0
77+
GRPC_VERSION=1.25.0 \
78+
PROTOBUF_VERSION=3.11.2 \
79+
ALPINE_GRPC_VERSION_SUFFIX=r1 \
80+
ALPINE_PROTOBUF_VERSION_SUFFIX=r1
8181

8282
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
8383
apk add --update --no-cache bash curl git grpc=${GRPC_VERSION}-${ALPINE_GRPC_VERSION_SUFFIX} protobuf=${PROTOBUF_VERSION}-${ALPINE_PROTOBUF_VERSION_SUFFIX} && \

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
@echo 'export PATH="$(GOBIN):$${PATH}"' >> $(TMP)/env
3232
@echo $(TMP)/env
3333

34-
BAZEL_VERSION := 0.24.1
34+
BAZEL_VERSION := 1.2.0
3535
BAZEL := $(TMP_VERSIONS)/bazel/$(BAZEL_VERSION)
3636
ifeq ($(UNAME_OS),Darwin)
3737
BAZEL_OS := darwin
@@ -112,6 +112,10 @@ all: lint cover bazeltest bazelbuild
112112
install:
113113
go install ./cmd/prototool
114114

115+
.PHONy: bins
116+
bins:
117+
go build ./cmd/prototool
118+
115119
.PHONY: license
116120
license: __eval_srcs $(UPDATE_LICENSE)
117121
update-license $(SRCS)

WORKSPACE

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,48 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
33

44
http_archive(
55
name = "io_bazel_rules_go",
6-
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.3/rules_go-0.18.3.tar.gz"],
7-
sha256 = "86ae934bd4c43b99893fc64be9d9fc684b81461581df7ea8fc291c816f5ee8c5",
8-
)
9-
10-
git_repository(
11-
name = "bazel_gazelle",
12-
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
13-
commit = "63ddd72aa315d020456f1a96bc6fcca9405810cb",
6+
urls = [
7+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
8+
"https://github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
9+
],
10+
sha256 = "e6a6c016b0663e06fa5fccf1cd8152eab8aa8180c583ec20c872f4f9953a7ac5",
1411
)
1512

1613
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
14+
1715
go_rules_dependencies()
16+
1817
go_register_toolchains()
1918

19+
http_archive(
20+
name = "bazel_gazelle",
21+
urls = [
22+
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
23+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
24+
],
25+
sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
26+
)
27+
2028
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
29+
2130
gazelle_dependencies()
2231

32+
git_repository(
33+
name = "com_google_protobuf",
34+
commit = "d0bfd5221182da1a7cc280f3337b5e41a89539cf",
35+
remote = "https://github.com/protocolbuffers/protobuf",
36+
shallow_since = "1581711200 -0800"
37+
)
38+
39+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
40+
41+
protobuf_deps()
42+
2343
load("//bazel:deps.bzl", "prototool_deps")
44+
45+
prototool_deps()
46+
47+
load("//bazel:deps.bzl", "prototool_deps")
48+
49+
# gazelle:repository_macro bazel/deps.bzl%prototool_deps
2450
prototool_deps()

0 commit comments

Comments
 (0)