Skip to content

Conversation

@RaduBerinde
Copy link
Member

@RaduBerinde RaduBerinde commented Nov 14, 2025

The https://github.com/go-yaml/yaml (import path gopkg.in/yaml.v3)
repository has been archived. The YAML team took over maintenance in a
separate fork at a very confusingly named
https://github.com/yaml/go-yaml (import path go.yaml.in/yaml/v4).

This commit updates uses of v3 to v4.0.0-rc.3 from the new
repository. No code changes are required.

Upgrading v2 uses to v4 will be done separately, as that requires code
changes.

Epic: none
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@RaduBerinde RaduBerinde force-pushed the yaml-v4-a branch 2 times, most recently from 87e14a0 to 4537e0c Compare November 14, 2025 17:54
@RaduBerinde RaduBerinde marked this pull request as ready for review November 14, 2025 19:27
@RaduBerinde RaduBerinde requested review from a team as code owners November 14, 2025 19:27
@RaduBerinde RaduBerinde requested review from Abhinav1299, DarrylWong, aa-joshi, arjunmahishi, golgeek, jasonlmfong and sumeerbhola and removed request for a team November 14, 2025 19:27
Copy link
Collaborator

@sumeerbhola sumeerbhola left a comment

Choose a reason for hiding this comment

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

:lgtm:

@sumeerbhola reviewed 50 of 50 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @aa-joshi, @Abhinav1299, @arjunmahishi, @DarrylWong, @golgeek, and @jasonlmfong)

@RaduBerinde
Copy link
Member Author

TFTR!

@RaduBerinde
Copy link
Member Author

bors r+

craig bot pushed a commit that referenced this pull request Nov 18, 2025
156897: kvserver: remove replica dependency in splitPreApply r=pav-kv a=arulajmani

Refactor to remove the need to pass in a replica struct to splitPreApply. This will make testing this in subsequent patches easier.

Epic: None
Release note: None

157800: go.mod: upgrade to yaml v4 r=RaduBerinde a=RaduBerinde

The https://github.com/go-yaml/yaml (import path `gopkg.in/yaml.v3`)
repository has been archived. The YAML team took over maintenance in a
separate fork at a very confusingly named
https://github.com/yaml/go-yaml (import path `go.yaml.in/yaml/v4`).

This commit updates uses of v3 to `v4.0.0-rc.3` from the new
repository. No code changes are required.

Upgrading v2 uses to v4 will be done separately, as that requires code
changes.

Epic: none
Release note: None


158012: kvserver: verbose Raft logging for TestLeaseRequestBumpsEpoch r=miraradeva a=miraradeva

See #157128 for details about the test failure.

Closes: #157128

Release note: None

Co-authored-by: Arul Ajmani <[email protected]>
Co-authored-by: Radu Berinde <[email protected]>
Co-authored-by: Mira Radeva <[email protected]>
@craig
Copy link
Contributor

craig bot commented Nov 18, 2025

Build failed (retrying...):

craig bot pushed a commit that referenced this pull request Nov 18, 2025
157800: go.mod: upgrade to yaml v4 r=RaduBerinde a=RaduBerinde

The https://github.com/go-yaml/yaml (import path `gopkg.in/yaml.v3`)
repository has been archived. The YAML team took over maintenance in a
separate fork at a very confusingly named
https://github.com/yaml/go-yaml (import path `go.yaml.in/yaml/v4`).

This commit updates uses of v3 to `v4.0.0-rc.3` from the new
repository. No code changes are required.

Upgrading v2 uses to v4 will be done separately, as that requires code
changes.

Epic: none
Release note: None


158012: kvserver: verbose Raft logging for TestLeaseRequestBumpsEpoch r=miraradeva a=miraradeva

See #157128 for details about the test failure.

Closes: #157128

Release note: None

Co-authored-by: Radu Berinde <[email protected]>
Co-authored-by: Mira Radeva <[email protected]>
@craig
Copy link
Contributor

craig bot commented Nov 18, 2025

Build failed (retrying...):

craig bot pushed a commit that referenced this pull request Nov 18, 2025
157800: go.mod: upgrade to yaml v4 r=RaduBerinde a=RaduBerinde

The https://github.com/go-yaml/yaml (import path `gopkg.in/yaml.v3`)
repository has been archived. The YAML team took over maintenance in a
separate fork at a very confusingly named
https://github.com/yaml/go-yaml (import path `go.yaml.in/yaml/v4`).

This commit updates uses of v3 to `v4.0.0-rc.3` from the new
repository. No code changes are required.

Upgrading v2 uses to v4 will be done separately, as that requires code
changes.

Epic: none
Release note: None


Co-authored-by: Radu Berinde <[email protected]>
@craig
Copy link
Contributor

craig bot commented Nov 18, 2025

Build failed:

@RaduBerinde
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 20, 2025

Merge conflict.

The https://github.com/go-yaml/yaml (import path `gopkg.in/yaml.v3`)
repository has been archived. The YAML team took over maintenance in a
separate fork at a very confusingly named
https://github.com/yaml/go-yaml (import path `go.yaml.in/yaml/v4`).

This commit updates uses of v3 to `v4.0.0-rc.3` from the new
repository. No code changes are required.

Upgrading v2 uses to v4 will be done separately, as that requires code
changes.

Epic: none
Release note: None
@RaduBerinde
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 21, 2025

@craig craig bot merged commit fd29a93 into cockroachdb:master Nov 21, 2025
23 of 24 checks passed
@RaduBerinde RaduBerinde deleted the yaml-v4-a branch November 21, 2025 04:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants