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.

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

build: remove crdb-protobuf-client node_modules with ui-maintainer-clean #82740

Merged
merged 1 commit into from
Jun 11, 2022

Conversation

sjbarag
Copy link
Contributor

@sjbarag sjbarag commented Jun 10, 2022

Since version 33 [1], dev ui clean --all removes the
pkg/ui/workspaces/db-console/src/js/node_modules tree. Remove that tree
with make ui-maintainer-clean to keep parity between the two build
systems.

[1] 2e9e7a5 (dev: bump to version 33, 2022-05-27)

Release note: None

Since version 33 [1], dev ui clean --all removes the
pkg/ui/workspaces/db-console/src/js/node_modules tree. Remove that tree
with make ui-maintainer-clean to keep parity between the two build
systems.

[1] 2e9e7a5 (dev: bump to version 33, 2022-05-27)

Release note: None
@sjbarag sjbarag requested a review from a team as a code owner June 10, 2022 18:23
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@maryliag maryliag left a comment

Choose a reason for hiding this comment

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

🚀 :lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@sjbarag
Copy link
Contributor Author

sjbarag commented Jun 10, 2022

bors r=maryliag,rickystewart

@craig
Copy link
Contributor

craig bot commented Jun 11, 2022

Build succeeded:

@craig craig bot merged commit f2cc0b3 into cockroachdb:master Jun 11, 2022
@blathers-crl
Copy link

blathers-crl bot commented Jun 11, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from e9ac4e6 to blathers/backport-release-22.1-82740: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants