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

release: do not bump version if already bumped #110696

Merged
merged 1 commit into from
Sep 15, 2023

Conversation

rail
Copy link
Member

@rail rail commented Sep 15, 2023

Previously, if the version was bumped manually, the automation would try to bump, write the same content to the file and fail committing changes.

This PR skips version bump in case it was already bumped. Additionally, some of the commit messages were adjusted.

Fixes: RE-468
Release note: None

@rail rail added C-bug Code not up to spec/doc, specs & docs deemed correct. Solution expected to change code/behavior. A-release T-release Release Engineering & Automation Team labels Sep 15, 2023
@rail rail requested a review from celiala September 15, 2023 03:07
@rail rail requested a review from a team as a code owner September 15, 2023 03:07
@rail rail self-assigned this Sep 15, 2023
@blathers-crl
Copy link

blathers-crl bot commented Sep 15, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Previously, if the version was bumped manually, the automation would
try to bump, write the same content to the file and fail committing
changes.

This PR skips version bump in case it was already bumped. Additionally,
some of the commit messages were adjusted.

Fixes: RE-468
Release note: None
Copy link
Collaborator

@celiala celiala left a comment

Choose a reason for hiding this comment

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

nice - LGTM!

@@ -274,3 +274,13 @@ func fileExistsInGit(branch string, f string) (bool, error) {
}
return true, nil
}

// fileContent uses `git cat-file -p ref:file` to get to the file contents without `git checkout`.
Copy link
Collaborator

Choose a reason for hiding this comment

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

ooh - cool command!

@rail
Copy link
Member Author

rail commented Sep 15, 2023

bors r=celiala

@craig
Copy link
Contributor

craig bot commented Sep 15, 2023

Build succeeded:

@craig craig bot merged commit 9856622 into cockroachdb:master Sep 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-release C-bug Code not up to spec/doc, specs & docs deemed correct. Solution expected to change code/behavior. T-release Release Engineering & Automation Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants