Skip to content

deps: bump errors #66880

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20210625-bump-errors-redact
Jul 22, 2021
Merged

deps: bump errors #66880
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20210625-bump-errors-redact

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Jun 25, 2021 •
edited
Loading

No description provided.

@knz knz requested a review from erikgrinaker June 25, 2021 13:28
@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Jun 25, 2021

This change is Reviewable

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jun 25, 2021

I messed up the version bump on both errors and redact 🤦
let's do this once more

@knz knz force-pushed the 20210625-bump-errors-redact branch from b9e5d31 to 6857212 Compare June 25, 2021 13:43
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jun 25, 2021

ok hopefully this works now

erikgrinaker
erikgrinaker approved these changes Jun 25, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 3 of 3 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @knz)

@knz knz mentioned this pull request Jun 25, 2021
Closed
@knz knz force-pushed the 20210625-bump-errors-redact branch 2 times, most recently from 992d148 to 04f0b37 Compare June 25, 2021 15:34
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jun 25, 2021

The PR is currently blocked on make bazel-generate being unable to proceed:

ERROR: /data/home/kena/.cache/bazel/_bazel_kena/9b9f53b7334495d6a871cbb472c466bb/external/io_bazel_rules_nogo/BUILD.bazel:3:6: in alias rule @io_bazel_rules_nogo//:nogo: cycle in dependency graph:
    //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

or

ERROR: /data/home/kena/.cache/bazel/_bazel_kena/9b9f53b7334495d6a871cbb472c466bb/external/io_bazel_rules_go/BUILD.bazel:73:16: in go_context_data rule @io_bazel_rules_go//:go_context_data: cycle in dependency graph:
    //:gazelle
    //:gazelle-runner
    @bazel_gazelle//cmd/gazelle:gazelle
    @bazel_gazelle//language/go:go_default_library
    @bazel_gazelle//language/go:go
    @bazel_gazelle//rule:rule
    @com_github_bazelbuild_buildtools//tables:go_default_library
.-> @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
ERROR: Analysis of target '//:gazelle' failed; build aborted

This looks like this may be due to the dependency upgrade of golang.org/x/tools?

@rickystewart: would welcome your help here.

@knz knz force-pushed the 20210625-bump-errors-redact branch from 04f0b37 to e0832e6 Compare June 25, 2021 15:40
@rickystewart rickystewart mentioned this pull request Jun 25, 2021
Closed
@rickystewart
Copy link
Copy Markdown
Collaborator

rickystewart commented Jun 25, 2021

The bug is bazel-contrib/rules_go#2479. I've bumped that thread with what I've found in my investigation here -- I don't have a workaround yet, hopefully we find one though.

@adityamaru adityamaru mentioned this pull request Jun 29, 2021
Closed
@knz knz mentioned this pull request Jun 30, 2021
Merged
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jun 30, 2021

I'm going to extract the most important update into a separate PR #67064

this decreases the priority somewhat but this issue is still a ticking bomb

craig bot pushed a commit that referenced this pull request Jul 1, 2021
@knz
Merge #67064 #67111
c452a0c 
67064: deps: bump cockroachdb/redact r=tbg a=knz

Fixes #64158

This introduces smart auto-formatting of structs and arrays
in redaction contexts.

This is a simplified version of  #66880 to avoid the bazel brokenness.

67111: backupccl: Add a test to verify only admins can control schedules. r=miretskiy a=miretskiy

Add a test to verify only admins can control schedules.

Release Notes: None

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
Co-authored-by: Yevgeniy Miretskiy <yevgeniy@cockroachlabs.com>
@knz knz mentioned this pull request Jul 5, 2021
Merged
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jul 5, 2021

another occurrence: #67221

@knz
deps: bump cockroachdb/errors
d1780d2 
This updates to the latest version of the errors package together with
a couple of dependencies.

The updated dependency on the most recent 'googleapis' might be
bringing a bug fix on the 'http2' package.

Release note: None
@knz knz force-pushed the 20210625-bump-errors-redact branch from e0832e6 to d1780d2 Compare July 22, 2021 16:20
@knz knz mentioned this pull request Jul 22, 2021
Closed
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jul 22, 2021

thanks

bors r=erikgrinaker

@knz knz changed the title deps: bump errors and redact deps: bump errors Jul 22, 2021
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 22, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 22, 2021

Build succeeded:

@craig craig bot merged commit 4cdbb99 into cockroachdb:master Jul 22, 2021
@knz knz deleted the 20210625-bump-errors-redact branch July 23, 2021 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@erikgrinaker erikgrinaker erikgrinaker approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@knz @cockroach-teamcity @rickystewart @erikgrinaker