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

Don't require clippy/miri for beta #50573

Merged
merged 2 commits into from
May 13, 2018
Merged

Don't require clippy/miri for beta #50573

merged 2 commits into from
May 13, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 9, 2018

r? @kennytm

cc @alexcrichton

I'm trying this out locally atm to see if it works as I think it should. Not sure how to test it for real except wait for the next beta.

fixes #50557

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2018
# ignore $2 (branch id)
verify_status $3 $4
else
if [ "$2" = beta ]; then
Copy link
Member

Choose a reason for hiding this comment

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

This could be elif

Copy link
Member

Choose a reason for hiding this comment

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

I think "beta" also here may want to be "beta_required"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so close, I tried elsif

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the "beta" here is the second arg to all function calls in status_check. It denotes the branch, not the kind of check. I should probably add more comments

verify_status $3 $4
else
if [ "$2" = beta ]; then
if grep -vq '"'"$1"'":"(test|build)-fail"' "$TOOLSTATE_FILE"; then
Copy link
Member

Choose a reason for hiding this comment

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

  1. You should just use -q here. The -v flag means inverted search

  2. grep by default uses BRE which means you need to escape the brackets and vertical bars:

    if grep -q '"'"$1"'":"\(test\|build\)-fail"' "$TOOLSTATE_FILE"; then

    or use -E to use ERE.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@alexcrichton
Copy link
Member

Awesome, thanks @oli-obk!

@oli-obk
Copy link
Contributor Author

oli-obk commented May 9, 2018

Locally I'm getting

Verifying status of book...
Verifying status of nomicon...
Verifying status of reference...
Verifying status of rust-by-example...
Verifying status of rls...
Verifying status of rustfmt...
Verifying status of clippy-driver...
Verifying status of miri...
Requiring test passing for book...
Requiring test passing for nomicon...
Requiring test passing for reference...
Requiring test passing for rust-by-example...
Requiring test passing for rls...
Requiring test passing for rustfmt...

if not on the nightly channel.

@kennytm
Copy link
Member

kennytm commented May 9, 2018

@bors r+

Thanks!

@oli-obk
Copy link
Contributor Author

oli-obk commented May 9, 2018

@bors r=kennytm

added some docs

@kennytm
Copy link
Member

kennytm commented May 9, 2018

🤔 bors is not seeing this PR. Closing and reopening.

@kennytm kennytm closed this May 9, 2018
@kennytm kennytm reopened this May 9, 2018
@kennytm
Copy link
Member

kennytm commented May 9, 2018

@bors r+

@bors
Copy link
Contributor

bors commented May 9, 2018

📌 Commit b817403 has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 9, 2018
alexcrichton added a commit to alexcrichton/rust that referenced this pull request May 10, 2018
Don't require clippy/miri for beta

r? @kennytm

cc @alexcrichton

I'm trying this out locally atm to see if it works as I think it should. Not sure how to test it for real except wait for the next beta.

fixes rust-lang#50557
kennytm added a commit to kennytm/rust that referenced this pull request May 12, 2018
Don't require clippy/miri for beta

r? @kennytm

cc @alexcrichton

I'm trying this out locally atm to see if it works as I think it should. Not sure how to test it for real except wait for the next beta.

fixes rust-lang#50557
@bors
Copy link
Contributor

bors commented May 13, 2018

⌛ Testing commit b817403 with merge 6fc409e...

bors added a commit that referenced this pull request May 13, 2018
Don't require clippy/miri for beta

r? @kennytm

cc @alexcrichton

I'm trying this out locally atm to see if it works as I think it should. Not sure how to test it for real except wait for the next beta.

fixes #50557
@bors
Copy link
Contributor

bors commented May 13, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 6fc409e to master...

@bors bors merged commit b817403 into rust-lang:master May 13, 2018
@oli-obk oli-obk deleted the tool_sanity branch June 15, 2020 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clippy and Miri should not block beta releases
5 participants