generated files: update google/protobuf v1.3.5, protoc v3.14.0 and fix install for go modules #2146
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thaJeztah
commented
Jun 1, 2021
api/services/control/control.pb.go
Outdated
Comment on lines
12
to
19
| _ "github.com/golang/protobuf/ptypes/timestamp" | ||
| types "github.com/moby/buildkit/api/types" | ||
| pb "github.com/moby/buildkit/solver/pb" | ||
| github_com_moby_buildkit_util_entitlements "github.com/moby/buildkit/util/entitlements" | ||
| github_com_opencontainers_go_digest "github.com/opencontainers/go-digest" | ||
| grpc "google.golang.org/grpc" | ||
| codes "google.golang.org/grpc/codes" | ||
| status "google.golang.org/grpc/status" | ||
| _ "google.golang.org/protobuf/types/known/timestamppb" |
There was a problem hiding this comment.
Updated protoc in a separate commit for visibility, and in case this change is problematic
There was a problem hiding this comment.
Looks like it's problematic indeed;
#28 [buildctl 1/1] RUN --mount=target=. --mount=target=/root/.cache,type=cache --mount=target=/go/pkg/mod,type=cache --mount=source=/tmp/.ldflags,target=/tmp/.ldflags,from=buildkit-version xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /usr/bin/buildctl ./cmd/buildctl && xx-verify --static /usr/bin/buildctl
#28 sha256:43c1d64f11a2dca8edd62a6ac448d7355a481e1faa15d331e267849e86aba17e
#28 0.434 build google.golang.org/protobuf/types/known/timestamppb: cannot load google.golang.org/protobuf/types/known/timestamppb: open /src/vendor/google.golang.org/protobuf/types/known/timestamppb: no such file or directory
#28 ERROR: executor failed running [/bin/sh -c xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /usr/bin/buildctl ./cmd/buildctl && xx-verify --static /usr/bin/buildctl]: exit code: 1
There was a problem hiding this comment.
Let me update to 3.11.4 instead (version used by google/protobuf); https://github.com/golang/protobuf/blob/v1.3.5/.travis.yml#L15
thaJeztah
force-pushed
the
fix_protobuf_install
branch
from
c9296bd to
89bdbe0
Compare
…o modules This patch updates the script and Dockerfile to prevent issues when using go modules. The first change is to use a plain `git clone` instead of `go get -d` to download the source. While (like "pre go-modules") `go get -d` won't *build* the binaries when go modules are used, it *will* use go modules to download the package (and dependencies); as a result: - no git repository will be cloned in gopath - go modules will be downloaded for "master" (not the version that we specify to build) Note: Once we update to Go 1.16, this script could be updated to use `go install <repo>@version` The second change is an update to the `update-generated-files` script to detect the correct version of google/protobuf to use from the `go.mod`'s `replace` rule, to make sure we generate (and verify) using the correct version. The Dockerfile was also updated to update the default versions specified in the PROTOBUF_VERSION and GOGO_VERSION build-args (although not strictly necessary). Regenerating the files with this version resulted in a minor formatting change. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
see https://github.com/golang/protobuf/blob/v1.3.5/.travis.yml#L15 Note that gogo/protobuf v1.3.2 updated protoc to v3.14.0; https://github.com/gogo/protobuf/releases/tag/v1.3.2 however, regenerating protobufs with this switched an import to use google.golang.org/protobuf/types/known/timestamppb instead of github.com/golang/protobuf/ptypes/timestamp, so using the older version for now Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
fix_protobuf_install
branch
from
89bdbe0 to
acbe79f
Compare
Merged
|
@tonistiigi ptal 🤗 |
tonistiigi
approved these changes
Jun 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
generated files: update google/protobuf v1.3.5, and fix install for go modules
This patch updates the script and Dockerfile to prevent issues when using go
modules.
The first change is to use a plain
git cloneinstead ofgo get -dto downloadthe source. While (like "pre go-modules")
go get -dwon't build the binarieswhen go modules are used, it will use go modules to download the package
(and dependencies); as a result:
to build)
Note: Once we update to Go 1.16, this script could be updated to use
go install <repo>@versionThe second change is an update to the
update-generated-filesscript to detectthe correct version of google/protobuf to use from the
go.mod'sreplacerule,to make sure we generate (and verify) using the correct version.
The Dockerfile was also updated to update the default versions specified in the
PROTOBUF_VERSION and GOGO_VERSION build-args (although not strictly necessary).
Regenerating the files with this version resulted in a minor formatting change.
generated-files: update protoc to v3.11.4 to match google/protobuf
see https://github.com/golang/protobuf/blob/v1.3.5/.travis.yml#L15
Note that gogo/protobuf v1.3.2 updated protoc to v3.14.0; https://github.com/gogo/protobuf/releases/tag/v1.3.2
however, regenerating protobufs with this switched an import to use
google.golang.org/protobuf/types/known/timestamppb instead of
github.com/golang/protobuf/ptypes/timestamp, so using the older
version for now