Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump Buf to v1.32.0 and move to v2 #41735

Merged
merged 7 commits into from
May 20, 2024
Merged

chore: Bump Buf to v1.32.0 and move to v2 #41735

merged 7 commits into from
May 20, 2024

Conversation

codingllama
Copy link
Contributor

@codingllama codingllama commented May 17, 2024 •
edited

Update to the latest release and migrate configs to v2.

@codingllama codingllama added backport/branch/v13 backport/branch/v14 no-changelog Indicates that a PR does not require a changelog entry backport/branch/v15 labels May 17, 2024
codingllama
codingllama commented May 17, 2024
View reviewed changes
api/proto/buf.lock Outdated
@@ -4,8 +4,10 @@ deps:
- remote: buf.build
owner: gogo
repository: protobuf
commit: b03c65ea87cdc3521ede29f62fe3ce239267c1bc
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Buf v1.32.0 is really unhappy about this hash. I ended up deleting the lock files and creating them again with buf dep update.

AFAICT this is still the same underlying commit, except the hash is from the Buf registry: https://buf.build/gogo/protobuf/commits/commit/4df00b267f944190a229ce3695781e99. If you look under "associated labels" you can see b03c65ea87cdc3521ede29f62fe3ce239267c1bc in there.

codingllama
codingllama commented May 17, 2024
View reviewed changes
gen/proto/ts/google/protobuf/descriptor_pb.ts
* member (each proto3 optional field gets its own synthetic oneof). Synthetic
* oneofs exist in the descriptor only, and do not generate any API. Synthetic
* oneofs must be ordered after all "real" oneofs.
* When proto3_optional is true, this field must belong to a oneof to signal
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear to me why this changed now, but it seems to be mostly edition related.

codingllama
codingllama commented May 17, 2024
View reviewed changes
proto/buf.yaml
@@ -1,7 +1,4 @@
version: v1
deps:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dep is not in use so I just took it out.

@codingllama
Copy link
Contributor Author

I do have a draft for a v2 config, but it's giving me trouble over a google/rpc/status.proto import. 🤷

@codingllama
Copy link
Contributor Author

I do have a draft for a v2 config, but it's giving me trouble over a google/rpc/status.proto import. 🤷

I got it. I'll mail something Monday.

@codingllama
Copy link
Contributor Author

PTAL - migrated to v2 config. It actually cuts some duplication in the linter declarations.

@codingllama codingllama changed the title chore: Bump Buf to v1.32.0 chore: Bump Buf to v1.32.0 and move to v2 May 20, 2024
@codingllama
Copy link
Contributor Author

Buf breaking is mad because it wants 32-char lock commits on the master branch too. It looks like we can push that even with Buf v1.31, so I've done that at #41776.

@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from hugoShaka May 20, 2024 19:01
@codingllama codingllama added this pull request to the merge queue May 20, 2024
Merged via the queue into master with commit c585850 May 20, 2024
39 checks passed
@codingllama codingllama deleted the codingllama/bump-buf branch May 20, 2024 22:57
@public-teleport-github-review-bot
Copy link

@codingllama See the table below for backport results.

Branch Result
branch/v13 Failed
branch/v14 Failed
branch/v15 Failed

This was referenced May 21, 2024
Closed
Closed
Closed
codingllama added a commit that referenced this pull request May 21, 2024
@codingllama
Revert "chore: Bump Buf to v1.32.0 and move to v2 (#41735)"
56d3d2d 
This reverts commit c585850.
github-merge-queue bot pushed a commit that referenced this pull request May 21, 2024
@codingllama
fix: Partially revert #41735 ("Buf config v2") (#41812)
b8dd19a 
* Revert "chore: Bump Buf to v1.32.0 and move to v2 (#41735)"

This reverts commit c585850.

* Bump Buf to v1.32.0

* Update generated protos
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabrielcorado gabrielcorado gabrielcorado approved these changes

@rosstimothy rosstimothy rosstimothy approved these changes

Assignees
No one assigned
Labels
backport/branch/v13 backport/branch/v14 backport/branch/v15 no-changelog Indicates that a PR does not require a changelog entry size/sm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@codingllama @gabrielcorado @rosstimothy