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 toolstate not pushing data for Linux #63191

Merged
merged 1 commit into from
Aug 1, 2019

Conversation

pietroalbini
Copy link
Member

A recent commit modified toolstate to only push updated data when the TOOLSTATE_PUBLISH environment variable is present. This worked fine on Windows but failed on Linux, since Linux jobs run inside Docker containers and the variable wasn't forwarded inside it.

This changes the Docker startup code to set the TOOLSTATE_PUBLISH enviornment variable inside the container if it's present outside.

r? @alexcrichton
fixes #63190

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 1, 2019
@alexcrichton
Copy link
Member

I think a bare --env TOOLSTATE_PUBLISH would work as well with the CLI, but either way r=me. I may be misremembering docker interbals

@pietroalbini
Copy link
Member Author

I'll do some testing in a bit.

A recent commit modified toolstate to only push updated data when the
TOOLSTATE_PUBLISH environment variable is present. This worked fine on
Windows but failed on Linux, since Linux jobs run inside Docker
containers and the variable wasn't forwarded inside it.

This changes the Docker startup code to set the TOOLSTATE_PUBLISH
enviornment variable inside the container if it's present outside.
@pietroalbini
Copy link
Member Author

Yeah good call.

@bors r=alexcrichton p=100

@bors
Copy link
Contributor

bors commented Aug 1, 2019

📌 Commit 8f8b3f2 has been approved by alexcrichton

@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 Aug 1, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Aug 1, 2019
…r=alexcrichton

ci: fix toolstate not pushing data for Linux

A recent commit modified toolstate to only push updated data when the `TOOLSTATE_PUBLISH` environment variable is present. This worked fine on Windows but failed on Linux, since Linux jobs run inside Docker containers and the variable wasn't forwarded inside it.

This changes the Docker startup code to set the `TOOLSTATE_PUBLISH` enviornment variable inside the container if it's present outside.

r? @alexcrichton
fixes rust-lang#63190
bors added a commit that referenced this pull request Aug 1, 2019
Rollup of 8 pull requests

Successful merges:

 - #62644 (simplify std::io::Write::write rustdoc)
 - #62971 (Add keywords item into the sidebar)
 - #63122 (Account for `maybe_whole_expr` in range patterns)
 - #63158 (Add test for issue-58951)
 - #63170 (cleanup StringReader fields)
 - #63179 (update test cases for vxWorks)
 - #63188 (Fix typos in release notes.)
 - #63191 (ci: fix toolstate not pushing data for Linux)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 1, 2019

⌛ Testing commit 8f8b3f2 with merge 435236b...

@bors bors merged commit 8f8b3f2 into rust-lang:master Aug 1, 2019
@pietroalbini pietroalbini deleted the really-fix-toolstate branch August 13, 2019 16:16
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.

Toolstate for Linux not correctly published
4 participants