Fix the Skia Infra -> Skia roller.
This CL attempts to fix the failed roll at https://skia-review.googlesource.com/c/skia/+/642917.
On patchset 7, I reproduced the roll failure by cherry-picking https://skia-review.googlesource.com/c/skia/+/642917.
On patchset 9, I updated //WORKSPACE.bazel and performed a CQ dry run to check that my fix works.
On patchset 10, I undid the cherry-pick and only left my //WORKSPACE.bazel changes.
How I arrived at this fix:
1. I cherry-picked the failing roll.
2. I identified the specific target that was failing to build:
$ bazel build --config=linux_rbe @go_googleapis//google/cloud/secretmanager/v1:secretmanager_proto
INFO: Invocation ID: dd135821-8c1e-4b2d-9a85-1a1c783c99ae
INFO: Analyzed target @go_googleapis//google/cloud/secretmanager/v1:secretmanager_proto (0 packages loaded, 0 targets configured).
INFO: Found 1 target...
ERROR: /usr/local/google/home/lovisolo/.cache/bazel/_bazel_lovisolo/3a6fe6d3989498d737d11b4d05e2cc2c/external/go_googleapis/google/cloud/secretmanager/v1/BUILD.bazel:4:14: Generating Descriptor Set proto_library @go_googleapis//google/cloud/secretmanager/v1:secretmanager_proto failed: (Exit 1): protoc failed: error executing command bazel-out/k8-opt-exec-81C6BA4F/bin/external/com_google_protobuf/protoc '--proto_path=bazel-out/k8-fastbuild/bin/external/com_google_protobuf/_virtual_imports/descriptor_proto' ... (remaining 28 arguments skipped)
google/cloud/secretmanager/v1/resources.proto: This file contains proto3 optional fields, but --experimental_allow_proto3_optional was not set.
Target @go_googleapis//google/cloud/secretmanager/v1:secretmanager_proto failed to build
Use --verbose_failures to see the command lines of failed build steps.
INFO: Elapsed time: 2.909s, Critical Path: 2.43s
INFO: 2 processes: 2 internal.
FAILED: Build did NOT complete successfully
3. The error is related to protobuf, so I checked the googleapis repo to see what version of the protobuf compiler they're using in their WORKSPACE file. The version is 3.18.1: https://github.com/googleapis/googleapis/blob/651416f510d94fdb776c52c579d394f43ed783d7/WORKSPACE#L48
4. I updated //WORKSPACE.bazel to use the same version.
5. I did a CQ dry run and verified that all pre-submit tasks pass.
Change-Id: I910608d882c1d90044818c4a6f27534526340319
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/643457
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Auto-Submit: Leandro Lovisolo <lovisolo@google.com>
1 file changed