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

Rollup of 7 pull requests #41558

Closed
wants to merge 19 commits into from
Closed

Rollup of 7 pull requests #41558

wants to merge 19 commits into from

Conversation

malbarbo and others added 19 commits April 18, 2017 13:50
Turns out all six of these impls are incorrect.
This build is no longer a forked version with temporary bugfixes, everything
should be upstreamed!
Now that the final bug fixes have been merged into sccache we can start
leveraging sccache on the MSVC builders on AppVeyor instead of relying on the
ad-hoc caching strategy of trigger files and whatnot.
…richton

Add bootstrap support for android
…brson

appveyor: Use Ninja/sccache on MSVC

Now that the final bug fixes have been merged into sccache we can start
leveraging sccache on the MSVC builders on AppVeyor instead of relying on the
ad-hoc caching strategy of trigger files and whatnot.
Step::replace_one should put a one, not a zero (Issue rust-lang#41492)

Turns out all six of the replace_* impls were backwards.
Address platform-specific behavior in TcpStream::shutdown

Fixes rust-lang#25164

r? @rust-lang/libs from the GitHub thread, it seems like documenting this behavior is okay, but I want to make sure that's what you want.
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Apr 26, 2017

📌 Commit fcb8910 has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Apr 26, 2017

⌛ Testing commit fcb8910 with merge 30081ed...

bors added a commit that referenced this pull request Apr 26, 2017
Rollup of 7 pull requests

- Successful merges: #41370, #41447, #41456, #41493, #41499, #41501, #41550
- Failed merges:
@aidanhs
Copy link
Member

aidanhs commented Apr 26, 2017

Pretty sure this has failed (see https://github.com/rust-lang/rust/commits/auto) with

appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-pc-windows-msvc
Error downloading remote file: One or more errors occurred.
Inner Exception: Remote server returned 404: Not Found
Command "appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-pc-windows-msvc" failed with exit code 2. Retrying 2 of 3
Error downloading remote file: One or more errors occurred.
Inner Exception: Remote server returned 404: Not Found
Command "appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-09-sccache-x86_64-pc-windows-msvc" failed with exit code 2. Retrying 3 of 3
Error downloading remote file: One or more errors occurred.
Inner Exception: Remote server returned 404: Not Found
Sorry, we tried running command for 3 times and all attempts were unsuccessful!
Command exited with code 2
cat %CD%\sccache.log || exit 0

on appveyor and a somewhat more opaque

[00:02:11]   Run Build Command:"/usr/bin/make" "cmTC_049b8/fast"
[00:02:11] 
[00:02:11]   /usr/bin/make -f CMakeFiles/cmTC_049b8.dir/build.make
[00:02:11]   CMakeFiles/cmTC_049b8.dir/build
[00:02:11] 
[00:02:11]   make[1]: Entering directory
[00:02:11]   '/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/CMakeFiles/CMakeTmp'
[00:02:11] 
[00:02:11] 
[00:02:11]   Building C object CMakeFiles/cmTC_049b8.dir/testCCompiler.c.o
[00:02:11] 
[00:02:11]   /usr/local/bin/sccache cc -ffunction-sections -fdata-sections -fPIC -m64 -o
[00:02:11]   CMakeFiles/cmTC_049b8.dir/testCCompiler.c.o -c
[00:02:11]   /checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/CMakeFiles/CMakeTmp/testCCompiler.c
[00:02:11] 
[00:02:11] 
[00:02:11]   /usr/local/bin/sccache: 2: /usr/local/bin/sccache: Syntax error: newline
[00:02:11]   unexpected

on a few different travis builders. Looks like sccache PR related, cc @alexcrichton

Unfortunately bors hasn't failed it for some reason, so it's currently blocking the queue.

@frewsxcv
Copy link
Member Author

@bors r-

@frewsxcv frewsxcv closed this Apr 26, 2017
@frewsxcv frewsxcv reopened this Apr 26, 2017
@frewsxcv frewsxcv closed this Apr 26, 2017
@frewsxcv frewsxcv reopened this Apr 26, 2017
@frewsxcv frewsxcv closed this Apr 26, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.