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

teamcity: grep for pebble version in go.mod rather than DEPS.bzl #83705

Merged
merged 1 commit into from
Jul 1, 2022

Conversation

rickystewart
Copy link
Collaborator

The grep can fail in the case that there is no more recent version of
pebble than the one that is vendored in-tree. This fixes that case.

Release note: None

@rickystewart rickystewart requested review from nicktrav and jbowens July 1, 2022 15:43
@rickystewart rickystewart requested a review from a team as a code owner July 1, 2022 15:43
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rickystewart rickystewart force-pushed the ricky-test-pebblemeta branch from 4c81100 to 81649ce Compare July 1, 2022 15:47
Copy link
Collaborator

@nicktrav nicktrav left a comment

Choose a reason for hiding this comment

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

:lgtm:

Thank you!

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @jbowens and @rickystewart)


build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic.sh line 25 at r1 (raw file):

echo "$NEW_DEPS_BZL_CONTENT" > DEPS.bzl

# Use the Pebble SHA from the version in the modified DEPS.bzl file.

nit: s/DEPS.bzl/go.mod/

The `grep` can fail in the case that there is no more recent version of
`pebble` than the one that is vendored in-tree. This fixes that case.

Release note: None
@rickystewart rickystewart force-pushed the ricky-test-pebblemeta branch from 81649ce to d412bce Compare July 1, 2022 15:54
Copy link
Collaborator

@jbowens jbowens left a comment

Choose a reason for hiding this comment

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

thanks! :lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (and 1 stale) (waiting on @nicktrav and @rickystewart)

@rickystewart
Copy link
Collaborator Author

TFTR!

bors r=nicktrav,jbowens

@craig
Copy link
Contributor

craig bot commented Jul 1, 2022

Build succeeded:

@craig craig bot merged commit 66f6952 into cockroachdb:master Jul 1, 2022
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