Skip to content

Commit f49d44a

Browse files
committed
all: update descriptor.proto to latest version
A recent change to the upstream descriptor.proto, appearing in google.golang.org/[email protected], removed the long-deprecated FileOptions.php_generic_services field. This backwards-incompatible change results in an incompatibility between the github.com/golang/protobuf and google.golang.org/protobuf modules. Bump the google.golang.org/protobuf version in go.mod, regenerate descriptors. Increase the minimum Go version requirement to go1.17 (the minimum supported by v1.33.0). For #1596
1 parent 5d5e8c0 commit f49d44a

File tree

5 files changed

+134
-7
lines changed

5 files changed

+134
-7
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-version: [1.11.x, 1.12.x, 1.13.x, 1.14.x, 1.15.x, 1.16.x]
7+
go-version: [1.17.x, 1.18.x, 1.19.x, 1.20.x, 1.21.x]
88
os: [ubuntu-latest, macos-latest]
99
runs-on: ${{ matrix.os }}
1010
steps:
@@ -15,8 +15,8 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v2
1717
- name: TestLatest
18-
if: matrix.go-version == '1.16.x'
18+
if: matrix.go-version == '1.21.x'
1919
run: ./test.bash
2020
- name: TestAll
21-
if: matrix.go-version != '1.16.x'
21+
if: matrix.go-version != '1.21.x'
2222
run: go test ./...

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Deprecated: Use the "google.golang.org/protobuf" module instead.
22
module github.com/golang/protobuf
33

4-
go 1.9
4+
go 1.17
55

66
require (
77
github.com/google/go-cmp v0.5.5
8-
google.golang.org/protobuf v1.26.0
8+
google.golang.org/protobuf v1.33.0
99
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
66
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
77
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
88
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
9+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
10+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

protoc-gen-go/descriptor/descriptor.pb.go

Lines changed: 126 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

protoc-gen-go/plugin/plugin.pb.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)