Skip to content

Make upgrade and upgrade dependencies#3021

Merged
bufdev merged 5 commits intomainfrom
make-upgrade-20240527-2
May 27, 2024
Merged

Make upgrade and upgrade dependencies#3021
bufdev merged 5 commits intomainfrom
make-upgrade-20240527-2

Conversation

@bufdev
Copy link
Member

@bufdev bufdev commented May 27, 2024

Replaces #3020.

@bufdev
Copy link
Member Author

bufdev commented May 27, 2024 •
edited
Loading

@jhump I can't figure out what is going on here - I'm attempting to update from v27.0-rc1 to v27.0, and I think I've updated everything in all the right places (double check), but I keep on getting this test failure:

--- FAIL: TestCompareGoogleapis (14.76s)
    prototesting.go:234:
        	Error Trace:	/Users/alice/dev/buf/private/pkg/prototesting/prototesting.go:234
        	           				/Users/alice/dev/buf/private/bufpkg/bufimage/build_image_unix_test.go:41
        	Error:      	Should be empty, but was diff -u buf protoc
        	           	--- buf	2024-05-27 12:34:34
        	           	+++ protoc	2024-05-27 12:34:34
        	           	@@ -2060,31 +2060,7 @@
        	           	          "extensionRange": [
        	           	            {
        	           	              "start": 1000,
        	           	-              "end": 9995,
        	           	-              "options": {
        	           	-                "declaration": [
        	           	-                  {
        	           	-                    "number": 1000,
        	           	-                    "fullName": ".pb.cpp",
        	           	-                    "type": ".pb.CppFeatures"
        	           	-                  },
        	           	-                  {
        	           	-                    "number": 1001,
        	           	-                    "fullName": ".pb.java",
        	           	-                    "type": ".pb.JavaFeatures"
        	           	-                  },
        	           	-                  {
        	           	-                    "number": 1002,
        	           	-                    "fullName": ".pb.go",
        	           	-                    "type": ".pb.GoFeatures"
        	           	-                  },
        	           	-                  {
        	           	-                    "number": 9990,
        	           	-                    "fullName": ".pb.proto1",
        	           	-                    "type": ".pb.Proto1Features"
        	           	-                  }
        	           	-                ]
        	           	-              }
        	           	+              "end": 9995
        	           	            },
        	           	            {
        	           	              "start": 9995,
        	           	\ No newline at end of file
        	Test:       	TestCompareGoogleapis

You can quickly reproduce if you run go test -run CompareGoogleapis ./private/bufpkg/bufimage on this branch. Any ideas?

@bufdev
Copy link
Member Author

bufdev commented May 27, 2024

I think what this is saying is that the FileDescriptorSet when produced by protoc (on version v.27.0) does not contain the above options on the extension range, whereas it did with v27.0-rc1, but I'm not sure

@bufdev
Copy link
Member Author

bufdev commented May 27, 2024

Fixed by adding --retain_options to the call as of v27.0

@bufdev bufdev merged commit 90659b3 into main May 27, 2024
@bufdev bufdev deleted the make-upgrade-20240527-2 branch May 27, 2024 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@bufdev