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

Revert "Try_run must only be used if toolstate is populated" #73275

Closed
wants to merge 1 commit into from

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jun 12, 2020

This reverts commit 6f01576.

#73097 made a change that appears to have broken toolstate although I can't tell what happened. Let's revert it for now so we get toolstate tracking back and don't ship broken tools.

r? @Mark-Simulacrum @RalfJung @rust-lang/infra

fixes #73274

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2020
@oli-obk
Copy link
Contributor Author

oli-obk commented Jun 12, 2020

@bors p=1

@RalfJung
Copy link
Member

I didn't realize this was in impl Step for Clippy... it seems rather impossible for this to be the cause here then.

@oli-obk
Copy link
Contributor Author

oli-obk commented Jun 12, 2020

I don't get the connection either, but maybe clippy being left over in toolstate but not participating in it somehow broke the toolstate logic? We've never removed something from toolstate before.

@RalfJung
Copy link
Member

maybe clippy being left over in toolstate but not participating in it somehow broke the toolstate logic?

Yeah I think that's what happened: what likely happened is that a clippy test failed, but for some reason, instead of aborting CI, that lead to all tools being marked as test-pass...

@oli-obk
Copy link
Contributor Author

oli-obk commented Jun 12, 2020

@bors rollup-

let's not get this into another rollup confusing things even more

@Mark-Simulacrum
Copy link
Member

I'll take a look at logs and such first thing today, I think that the patch we landed was correct, but may mean that we need to drop clippy from the toolstate builder or move it around a bit.

@Mark-Simulacrum
Copy link
Member

I'm going to go ahead and close this as we have an actual fix up (and approved) now.

@oli-obk oli-obk deleted the toolstate branch June 15, 2020 08:42
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2020
…ng,oli-obk

Avoid prematurely recording toolstates

When we're running with dry_run enabled (i.e. all builds do this initially), we're
guaranteed to save of a toolstate of TestFail for tools that aren't tested. In practice,
we do test tools as well, so for those tools we would initially record them as being
TestPass, and then later on re-record the correct state after actually testing them.
However, this would not work well if the build failed for whatever reason (e.g. panicking
in bootstrap, or as was the case in rust-lang#73097, clippy failing to test successfully), we would
just go on believing that things passed when they in practice did not.

This commit also adjusts saving toolstate to never record clippy explicitly (otherwise, it
would be recorded when building it); eventually that'll likely move to other tools as well
but not yet. This is deemed simpler than checking everywhere we generically save
toolstate.

We also move clippy out of the "toolstate" no-fail-fast build into a separate x.py
invocation; this should no longer be technically required but provides the nice state of
letting us check toolstate for all tools and only then check clippy (giving full results
on every build).

r? @oli-obk

Supercedes rust-lang#73275, also fixes rust-lang#73274
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Toolstate tracking is broken
4 participants