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

Automerge version bumps #390

Merged
merged 1 commit into from
May 23, 2024
Merged

Automerge version bumps #390

merged 1 commit into from
May 23, 2024

Conversation

rail
Copy link
Member

@rail rail commented May 23, 2024

This change marks PRs created by cockroach-teamcity ready to be merged after all checks are passed.

@rail rail requested a review from celiala May 23, 2024 15:37
@rail rail self-assigned this May 23, 2024
Copy link
Contributor

@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.

woo - excited for this!

had one suggestion (inline) - but not blocking (i.e. PR also okay as-is)

branches: [ master ]
paths:
# Trigger the workflow only for certain files. First we need to exclude all
# files, then add the files we care about.
Copy link
Contributor

Choose a reason for hiding this comment

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

nice!

# files. We restore the changed files to their original state on the
# default branch, run the commands to regenerate the change, and verify
# the result matches the PR contents (git diff does not show any changes).
- name: Regenerate the patch
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: maybe name this "confirm expected patch" or something?

(then under "verify nothing changed" move the build steps in there, i.e.)

bazel build //build
$(bazel info bazel-bin)/build/build_/build bump "$appVersion"

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll rename the step. 👍
The build steps generate the patch, so they kind of belong to this step IMO.

Copy link
Contributor

Choose a reason for hiding this comment

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

ah, gotcha. cool, works for me :) 👍🏼

This change marks PRs created by `cockroach-teamcity` ready to be merged
after all checks are passed.
@rail rail merged commit 0ad265c into cockroachdb:master May 23, 2024
9 checks passed
@rail rail deleted the automerge branch May 23, 2024 16:40
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.

2 participants