Skip to content

deps: update bufbuild/buf#67221

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20210705-buf
Jan 6, 2022
Merged

deps: update bufbuild/buf#67221
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20210705-buf

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Jul 5, 2021 •
edited
Loading

First commit from #74510.

Release note: None

@knz knz requested a review from dt July 5, 2021 16:52
@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Jul 5, 2021

This change is Reviewable

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jul 5, 2021

Note: this PR is currently failing on Bazel CI with the following error:

    //pkg/cmd/generate-test-suites:generate-test-suites
    @io_bazel_rules_go//:go_context_data
.-> @io_bazel_rules_nogo//:nogo
|   @io_bazel_rules_go//:default_nogo
|   @io_bazel_rules_go//go/tools/builders:nogo_srcs
|   @org_golang_x_tools//go/analysis:go_tool_library
|   @org_golang_x_tools//internal/analysisinternal:go_tool_library
|   @org_golang_x_tools//go/ast/astutil:go_tool_library
|   @org_golang_x_tools//internal/typeparams:typeparams
|   @io_bazel_rules_go//:go_context_data
`-- @io_bazel_rules_nogo//:nogo
ERROR: Analysis of target '//pkg/cmd/generate-test-suites:generate-test-suites' failed; build aborted

This is because it upgrades x/tools and that tickles this bug in gazelle. bazel-contrib/rules_go#2479

Same issue as in #66880 and #66993

@knz knz mentioned this pull request Jul 5, 2021
Merged
knz added a commit to cockroachdb/buf that referenced this pull request Jul 5, 2021
@knz
Fix unix builds
fe55639 
Note: this commit should not necessary as this has been
suitably fixed on the 'master' branch already.
However, the fixes are only available in 0.43.3 or later
and CockroachDB cannot upgrade to that version because of
cockroachdb/cockroach#67221 (comment)
and
bazel-contrib/rules_go#2479

So we're using this backport fix instead until that
other dependency management issue is resolved.
@knz knz mentioned this pull request Jul 5, 2021
Merged
craig bot pushed a commit that referenced this pull request Jul 5, 2021
@knz
Merge #67222
464ddb9 
67222: deps: update bufbuild/buf r=dt a=knz

Fixes #67216.

This is a simplified version of #67221 until a fix for the bazel  rules (see [this comment](#67221 (comment))) is available.

Release note: None

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
knz added a commit to cockroachdb/buf that referenced this pull request Jul 6, 2021
@knz
Fix unix builds
883d340 
Note: this commit should not necessary as this has been
suitably fixed on the 'master' branch already.
However, the fixes are only available in 0.43.3 or later
and CockroachDB cannot upgrade to that version because of
cockroachdb/cockroach#67221 (comment)
and
bazel-contrib/rules_go#2479

So we're using this backport fix instead until that
other dependency management issue is resolved.
@knz knz requested a review from rickystewart January 2, 2022 12:52
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 2, 2022

This is now ready for review.

@knz knz requested a review from a team as a code owner January 3, 2022 15:30
@rickystewart
Copy link
Copy Markdown
Collaborator

rickystewart commented Jan 4, 2022

Looks like CI is failing and you need to make vendor-rebuild?

@knz knz requested a review from a team as a code owner January 6, 2022 16:57
@knz knz requested review from a team and ajwerner and removed request for a team January 6, 2022 16:57
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 6, 2022

This is again ready for review, PTAL

@knz
deps: update bufbuild/buf
d867418 
Release note: None
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 6, 2022

TFYR!

bors r=rickystewart

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 6, 2022

Build succeeded:

@craig craig bot merged commit 1b63996 into cockroachdb:master Jan 6, 2022
@knz knz deleted the 20210705-buf branch January 7, 2022 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rickystewart rickystewart rickystewart approved these changes

@dt dt Awaiting requested review from dt

@ajwerner ajwerner Awaiting requested review from ajwerner ajwerner was automatically assigned from cockroachdb/cdc-prs

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@knz @cockroach-teamcity @rickystewart