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

chore(risedev): bump cargo-make version #9366

Merged
merged 3 commits into from
Apr 24, 2023
Merged

chore(risedev): bump cargo-make version #9366

merged 3 commits into from
Apr 24, 2023

Conversation

BugenZhao
Copy link
Member

@BugenZhao BugenZhao commented Apr 23, 2023

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

For example, changes introduced in #9006 use a recent functionality files_modified" of cargo-make`.

Checklist For Contributors

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • I have demonstrated that backward compatibility is not broken by breaking changes and created issues to track deprecated features to be removed in the future. (Please refer to the issue)
  • All checks passed in ./risedev check (or alias, ./risedev c)

Checklist For Reviewers

  • I have requested macro/micro-benchmarks as this PR can affect performance substantially, and the results are shown.

Documentation

  • My PR DOES NOT contain user-facing changes.
Click here for Documentation

Types of user-facing changes

Please keep the types that apply to your changes, and remove the others.

  • Installation and deployment
  • Connector (sources & sinks)
  • SQL commands, functions, and operators
  • RisingWave cluster configuration changes
  • Other (please specify in the release note below)

Release note

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
@BugenZhao
Copy link
Member Author

Actually, it's added in a patch version of cargo-make (0.36.6) 😅, so I'm also wishing to compare the patch version, that is, whether the version meets the requirement of "~0.36.6". Though cargo install can already handle updates after rust-lang/cargo#6667, it requires the network connection to work. Any ideas from my dear @xxchan?

risedev Outdated
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

if [ -z "$(which cargo-make)" ]; then
if [[ $(cargo make --version) != "cargo-make 0.36"* ]]; then
Copy link
Member

@xxchan xxchan Apr 23, 2023

Choose a reason for hiding this comment

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

>= ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It's hard to do ">" for semver in bash.

Copy link
Member

Choose a reason for hiding this comment

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

👼

Copy link
Collaborator

@TennyZhuang TennyZhuang left a comment

Choose a reason for hiding this comment

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

LGTM

risedev Outdated
echo "Installing cargo-make..."
cargo install cargo-make --version "^0.35" --locked
cargo install cargo-make --version "^0.36" --locked
Copy link
Member

@xxchan xxchan Apr 23, 2023

Choose a reason for hiding this comment

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

Should it be

Suggested change
cargo install cargo-make --version "^0.36" --locked
cargo install cargo-make --version "~0.36" --locked

?

Because the check is != "cargo-make 0.36"*

@xxchan
Copy link
Member

xxchan commented Apr 23, 2023

My honey @BugenZhao, I think it's good enough, although occasionally breaks 😇. If you really want to fix it, I think we should also consider how to manage versions for e.g., cargo-hakari.

@xxchan
Copy link
Member

xxchan commented Apr 23, 2023

BTW, cargo make supports installing dependencies and specifying versions https://github.com/sagiegurari/cargo-make#defining-version 🤔

@xxchan
Copy link
Member

xxchan commented Apr 23, 2023

@BugenZhao
Copy link
Member Author

sagiegurari/cargo-make@d24e1d1#minimal-version

This is really cool. 🫡 Thank you, my sweet @xxchan.

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
@codecov
Copy link

codecov bot commented Apr 23, 2023

Codecov Report

Merging #9366 (00fe287) into main (2f62af4) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #9366      +/-   ##
==========================================
- Coverage   70.79%   70.79%   -0.01%     
==========================================
  Files        1227     1227              
  Lines      203447   203447              
==========================================
- Hits       144039   144038       -1     
- Misses      59408    59409       +1     
Flag Coverage Δ
rust 70.79% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 6 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
@BugenZhao BugenZhao added this pull request to the merge queue Apr 24, 2023
Merged via the queue into main with commit 6e78805 Apr 24, 2023
5 checks passed
@BugenZhao BugenZhao deleted the bz/bump-cargo-make branch April 24, 2023 05:07
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.

None yet

3 participants