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

ci: fix wrong shared.sh import for publish_toolstate #68003

Merged
merged 1 commit into from
Jan 8, 2020

Conversation

pietroalbini
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2020
@Mark-Simulacrum
Copy link
Member

Hm, I think toolstate is working right now - is there some context I'm missing? Maybe we can drop the import entirely?

@pietroalbini
Copy link
Member Author

Oh, yeah, I should've added context, sorry.

#67733 broke it: when I originally made the PR, publish_toolstate.sh was in src/ci/scripts, but you moved it to src/ci, so the import path is wrong. See #67733 (comment) for the failure.

@Mark-Simulacrum
Copy link
Member

Ah, cool, okay! @bors r+ then. (I guess maybe we should bump priority, or just roll this up?)

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit aabc736 has been approved by Mark-Simulacrum

@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 Jan 8, 2020
@pietroalbini
Copy link
Member Author

@bors p=100

Feel free to roll this up.

@bors
Copy link
Contributor

bors commented Jan 8, 2020

⌛ Testing commit aabc736 with merge 50085f5267146d829f962e8c39f3c175a7fa4c54...

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 8, 2020
…fix, r=Mark-Simulacrum

ci: fix wrong shared.sh import for publish_toolstate

r? @Mark-Simulacrum
@JohnTitor
Copy link
Member

@bors retry rolled up

bors added a commit that referenced this pull request Jan 8, 2020
Rollup of 10 pull requests

Successful merges:

 - #67774 (Try statx for all linux-gnu target.)
 - #67781 (Move `is_min_const_fn` query to librustc_mir.)
 - #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs)
 - #67849 (Add a check for swapped words when we can't find an identifier)
 - #67875 (Distinguish between private items and hidden items in rustdoc)
 - #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`)
 - #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates)
 - #67977 (Updates for VxWorks)
 - #67985 (Remove insignificant notes from CStr documentation)
 - #68003 (ci: fix wrong shared.sh import for publish_toolstate)

Failed merges:

 - #67820 (Parse the syntax described in RFC 2632)
 - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)

r? @ghost
bors added a commit that referenced this pull request Jan 8, 2020
Rollup of 10 pull requests

Successful merges:

 - #67774 (Try statx for all linux-gnu target.)
 - #67781 (Move `is_min_const_fn` query to librustc_mir.)
 - #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs)
 - #67849 (Add a check for swapped words when we can't find an identifier)
 - #67875 (Distinguish between private items and hidden items in rustdoc)
 - #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`)
 - #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates)
 - #67977 (Updates for VxWorks)
 - #67985 (Remove insignificant notes from CStr documentation)
 - #68003 (ci: fix wrong shared.sh import for publish_toolstate)

Failed merges:

 - #67820 (Parse the syntax described in RFC 2632)
 - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 8, 2020

⌛ Testing commit aabc736 with merge caa231d...

@bors bors merged commit aabc736 into rust-lang:master Jan 8, 2020
@pietroalbini pietroalbini deleted the yet-another-toolstate-fix branch December 23, 2020 23:00
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.

5 participants