Skip to content

go.mod: bump datadriven - #154867

Merged
craig[bot] merged 1 commit into
cockroachdb:masterfrom
RaduBerinde:bump-datadriven
Oct 7, 2025
Merged

craig[bot] merged 1 commit into
cockroachdb:masterfrom
RaduBerinde:bump-datadriven

Conversation

@RaduBerinde

Copy link
Copy Markdown
Member

Bump datadriven to incorporate a fix
(cockroachdb/datadriven#60).

Epic: none
Release note: None

@RaduBerinde
RaduBerinde requested a review from kev-cao October 6, 2025 16:01
@RaduBerinde
RaduBerinde requested a review from a team as a code owner October 6, 2025 16:01
@cockroach-teamcity

Copy link
Copy Markdown
Member

This change is Reviewable

@RaduBerinde
RaduBerinde requested review from a team as code owners October 6, 2025 16:42
@RaduBerinde
RaduBerinde requested review from Abhinav1299, aa-joshi, arjunmahishi and dhartunian and removed request for a team October 6, 2025 16:42
@RaduBerinde

Copy link
Copy Markdown
Member Author

TFTR!

Remaining unit test failure is a flake (#154805)

bors r+

@kev-cao

kev-cao commented Oct 6, 2025

Copy link
Copy Markdown
Contributor

@RaduBerinde We'll also want to backport this to 25.4 — #154833

@craig

craig Bot commented Oct 6, 2025

Copy link
Copy Markdown
Contributor

Build failed (retrying...):

@RaduBerinde RaduBerinde added the backport-25.4.x Flags PRs that need to be backported to 25.4 label Oct 6, 2025
@RaduBerinde

Copy link
Copy Markdown
Member Author

This will conflict with #154874, will cancel and rebase.

bors r-

@craig

craig Bot commented Oct 6, 2025

Copy link
Copy Markdown
Contributor

Canceled.

Bump datadriven to incorporate a fix
(cockroachdb/datadriven#60).

Epic: none
Release note: None
@RaduBerinde

Copy link
Copy Markdown
Member Author

bors r+

@craig

craig Bot commented Oct 7, 2025

Copy link
Copy Markdown
Contributor

@craig
craig Bot merged commit 2c4fb19 into cockroachdb:master Oct 7, 2025
24 checks passed
@blathers-crl

blathers-crl Bot commented Oct 7, 2025

Copy link
Copy Markdown

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.


💡 Consider backporting to the fork repo instead of the main repo. See instructions for more details.

error creating merge commit from 6a99124 to blathers/backport-release-25.4-154867: 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 25.4.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-25.4.x Flags PRs that need to be backported to 25.4 backport-failed v26.1.0-prerelease

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants