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

User may want to skip tidy check sometimes #113206

Merged
merged 1 commit into from
Jul 1, 2023

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Jun 30, 2023

Fixes #113135

@rustbot
Copy link
Collaborator

rustbot commented Jun 30, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2023
@Kobzol
Copy link
Contributor

Kobzol commented Jun 30, 2023

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned Mark-Simulacrum Jun 30, 2023
@Kobzol
Copy link
Contributor

Kobzol commented Jun 30, 2023

This won't have an effect for people that already have the hook installed, but that's not such an issue, since this PR is aimed towards future new contributors anyway. I have tested it locally that it works.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 30, 2023

📌 Commit cfa1a79 has been approved by Kobzol

It is now in the queue for this repository.

@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 Jun 30, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 30, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#113072 (str docs: remove "Basic usage" text where not useful)
 - rust-lang#113153 (make HashMap::or_insert_with example more simple)
 - rust-lang#113185 (Set `channel = nightly` in dist profile)
 - rust-lang#113186 (document that the panic in collect_intra_doc_links is load-bearing)
 - rust-lang#113187 (No need to distinguish `LocalTy` from `Ty`)
 - rust-lang#113189 (compiletest: Only trim the end of process output)
 - rust-lang#113191 (Update browser-ui-test version and improve GUI test)
 - rust-lang#113206 (User may want to skip tidy check sometimes)

r? `@ghost`
`@rustbot` modify labels: rollup
Comment on lines 17 to +18
./x test tidy --set build.locked-deps=true
if [ $? -ne 0 ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
./x test tidy --set build.locked-deps=true
if [ $? -ne 0 ]; then
res=ok
./x test tidy --set build.locked-deps=true || res=fail
if [ "$res" != 0 ]; then

Probably too late, but you could do something like this to not need to disable the -e flag. Not really needed anyway in this tiny script though

Copy link
Member Author

Choose a reason for hiding this comment

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

nice trick!
but it should be:

if [ "$res" != "ok" ]; then

right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Whoops, you're right!

@bors bors merged commit 58a61ee into rust-lang:master Jul 1, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jul 1, 2023
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.

suggest --no-verify if the git hook fails
6 participants