Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

upgrade grpc to v1.47.0 #59

Merged
merged 1 commit into from
Sep 22, 2022
Merged

upgrade grpc to v1.47.0 #59

merged 1 commit into from
Sep 22, 2022

Conversation

pav-kv
Copy link
Contributor

@pav-kv pav-kv commented Sep 22, 2022

No description provided.

@pav-kv pav-kv changed the title update vendor to reflect the grpc@v1.47.0 upgrade upgrade grpc to v1.47.0 Sep 22, 2022
@pav-kv
Copy link
Contributor Author

pav-kv commented Sep 22, 2022

No need to merge to master, the branch stays in this repo, and the corresponding commit will be referenced.

@pav-kv pav-kv closed this Sep 22, 2022
@pav-kv
Copy link
Contributor Author

pav-kv commented Sep 22, 2022

Will create a new branch with no PR, because it's very tempting to press "Delete branch" in this PR at any time in the future.

@dt
Copy link
Member

dt commented Sep 22, 2022

we typically fast forward push master to the referenced commit after the cockroachdb/cockroach PR referencing it merges at which point it is permanently going to be reachable from a protected branch; at that point you can delete the named branch

@pav-kv
Copy link
Contributor Author

pav-kv commented Sep 22, 2022

we typically fast forward push master to the referenced commit after the cockroachdb/cockroach PR referencing it merges at which point it is permanently going to be reachable from a protected branch; at that point you can delete the named branch

@dt What if crdb master rolls back to reference the previous commit of vendored? And then, say, upgrades to a different version. In this case we can't fast-forward vendored master, will have to move it to the forked branch, and leave a placeholder branch instead of the old master.

Does it never happen?

@dt
Copy link
Member

dt commented Sep 22, 2022

vendored/master is protected, so if someone made a new vendored commit off of an older parent than the current head, you'd need a merge commit to push it

@pav-kv
Copy link
Contributor Author

pav-kv commented Sep 22, 2022

Makes sense, thanks @dt. Then my plan is to just merge this PR after cockroachdb/cockroach#88470 is merged. This will result in a fast-forwarded master in vendored as you suggested.

@pav-kv pav-kv reopened this Sep 22, 2022
@dt
Copy link
Member

dt commented Sep 22, 2022

perfect -- in the meantime it looks like nobody has pushed the currently crdb referenced commit to master here for awhile (meaning it isn't protected) so I'll do that real quick.

@pav-kv
Copy link
Contributor Author

pav-kv commented Sep 22, 2022

@dt thanks. I will rebase after you do it, this PR will nicely contain one commit then.

@pav-kv pav-kv merged commit a8c0962 into master Sep 22, 2022
@pav-kv pav-kv deleted the upd_vendor_with_grpc_1_47 branch September 22, 2022 22:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants