Skip to content

Commit f7fcf5b

Browse files
committed
types/descriptorpb: regenerate using latest protobuf v30 release
The changes to integration_test.go and internal/filedesc/editions.go were manual, the rest is the result of ./regenerate.bash. Note that while Protobuf v30 supports Bazel 8, the targets we need ("test and release targets") still require Bazel 7. An easy way to work with Bazel 7 is to use bazelisk: mkdir /tmp/wrap cat > /tmp/wrap/bazel <<'EOT' USE_BAZEL_VERSION=7.x bazelisk "$@" EOT chmod +x /tmp/wrap/bazel export PATH=/tmp/wrap:$PATH ./regenerate.bash Change-Id: Idfa8d149995025ec5194711ca60648cee50b0766 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/654955 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Chressie Himpel <[email protected]>
1 parent 9c8c2dd commit f7fcf5b

File tree

9 files changed

+1379
-500
lines changed

9 files changed

+1379
-500
lines changed

integration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var (
3333
regenerate = flag.Bool("regenerate", false, "regenerate files")
3434
buildRelease = flag.Bool("buildRelease", false, "build release binaries")
3535

36-
protobufVersion = "29.1"
36+
protobufVersion = "30.0"
3737

3838
golangVersions = func() []string {
3939
// Version policy: oldest supported version of Go, plus the version before that.
8 Bytes
Binary file not shown.

internal/filedesc/editions.go

+3
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ func unmarshalFeatureSet(b []byte, parent EditionFeatures) EditionFeatures {
6969
parent.IsDelimitedEncoded = v == genid.FeatureSet_DELIMITED_enum_value
7070
case genid.FeatureSet_JsonFormat_field_number:
7171
parent.IsJSONCompliant = v == genid.FeatureSet_ALLOW_enum_value
72+
case genid.FeatureSet_EnforceNamingStyle_field_number:
73+
// EnforceNamingStyle is enforced in protoc, languages other than C++
74+
// are not supposed to do anything with this feature.
7275
default:
7376
panic(fmt.Sprintf("unkown field number %d while unmarshalling FeatureSet", num))
7477
}

internal/genid/descriptor_gen.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)