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

tools: switch md5 cmd name based on existence #124293

Merged
merged 1 commit into from
May 21, 2024
Merged

Conversation

dt
Copy link
Member

@dt dt commented May 16, 2024

Release note: none.
Epic: none.

@dt dt requested a review from rickystewart May 16, 2024 19:50
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rickystewart
Copy link
Collaborator

rickystewart commented May 16, 2024

Hmm, just a thought, I think my preferred solution would be to simply check which md5 and fall back to md5sum if it is not available (or vice-versa). The OS doesn't really matter except when it comes to how the two binaries that do the same thing are named. We can simply check whether the binaries are installed. (This is fine, you can still merge it.)

Release note: none.
Epic: none.
@dt dt changed the title tools: switch md5 cmd name based on uname tools: switch md5 cmd name based on existence May 21, 2024
@dt
Copy link
Member Author

dt commented May 21, 2024

TFTR!

simply check which md5

Good point, done.

bors r+

@craig
Copy link
Contributor

craig bot commented May 21, 2024

Timed out.

@dt
Copy link
Member Author

dt commented May 21, 2024

bors r+

@craig craig bot merged commit 7807ee2 into cockroachdb:master May 21, 2024
22 checks passed
@dt dt deleted the darwin-md5 branch May 21, 2024 17:59
@dt
Copy link
Member Author

dt commented Jun 3, 2024

blathers backport 24.1 23.2 23.1

Copy link

blathers-crl bot commented Jun 3, 2024

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.


error creating merge commit from 1304f42 to blathers/backport-release-23.1-124293: 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 23.1 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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants